aboutsummaryrefslogtreecommitdiff
path: root/src/util.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-06-13 16:56:37 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-06-13 16:56:37 +0200
commit39cf857db9b926c47f545cba1d7113267260c40e (patch)
tree8aa3a7fbfa8079e7837650c8c3f0e9032ba87df4 /src/util.h
parente83474f2ebbae84394f0b86cfea977d3024bd33f (diff)
Internationalization -- initial step, make _ return a std::string to prevent memory leaks
Diffstat (limited to 'src/util.h')
-rw-r--r--src/util.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util.h b/src/util.h
index 25e1f77fd7..4759e8c1ce 100644
--- a/src/util.h
+++ b/src/util.h
@@ -140,14 +140,14 @@ inline int myclosesocket(SOCKET& hSocket)
return ret;
}
#define closesocket(s) myclosesocket(s)
-
+#if 0
#ifndef GUI
inline const char* _(const char* psz)
{
return psz;
}
#endif
-
+#endif
@@ -177,8 +177,8 @@ void RandAddSeed();
void RandAddSeedPerfmon();
int OutputDebugStringF(const char* pszFormat, ...);
int my_snprintf(char* buffer, size_t limit, const char* format, ...);
-std::string strprintf(const char* format, ...);
-bool error(const char* format, ...);
+std::string strprintf(const std::string &format, ...);
+bool error(const std::string &format, ...);
void LogException(std::exception* pex, const char* pszThread);
void PrintException(std::exception* pex, const char* pszThread);
void PrintExceptionContinue(std::exception* pex, const char* pszThread);