Biome API: Re-calculate biome at every surface in a mapchunk column

[dragonfireclient.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index 862274a31d20542a2b88241d28a36f3b9f399721..dce45fa3aafd3b339bbf843cbcb6fc5ab3b53c5b 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GETTEXT_HEADER
 
 #include "config.h" // for USE_GETTEXT
-#include "log.h"
 
 #if USE_GETTEXT
 #include <libintl.h>
@@ -33,57 +32,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define gettext_noop(String) String
 #define N_(String) gettext_noop (String)
 
-#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#ifndef _WIN32_WINNT
-       #define _WIN32_WINNT 0x0501
-#endif
-#include <windows.h>
-
-#endif // #if defined(_WIN32)
-
 #ifdef _MSC_VER
-void init_gettext(const char *path,std::string configured_language,int argc, char** argv);
+void init_gettext(const char *path, const std::string &configured_language, int argc, char** argv);
 #else
-void init_gettext(const char *path,std::string configured_language);
+void init_gettext(const char *path, const std::string &configured_language);
 #endif
 
-/******************************************************************************/
-inline wchar_t* chartowchar_t(const char *str)
-{
-       wchar_t* nstr = 0;
-#if defined(_WIN32)
-       int nResult = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, 0, 0 );
-       if( nResult == 0 )
-       {
-               fprintf( stderr, "error: MultiByteToWideChar returned null\n" );
-       }
-       else
-       {
-               nstr = new wchar_t[nResult];
-               MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, (WCHAR *) nstr, nResult );
-       }
-#else
-       size_t l = strlen(str)+1;
-       nstr = new wchar_t[l];
-       mbstowcs(nstr, str, l);
-#endif
+extern const wchar_t *narrow_to_wide_c(const char *mbs);
+extern std::wstring narrow_to_wide(const std::string &mbs);
 
-       return nstr;
+// You must free the returned string!
+inline const wchar_t *wgettext(const char *str)
+{
+       return narrow_to_wide_c(gettext(str));
 }
 
-/******************************************************************************/
-inline wchar_t* wgettext(const char *str)
+// Gettext under MSVC needs this strange way. Just don't ask...
+inline std::wstring wstrgettext(const std::string &text)
 {
-       return chartowchar_t(gettext(str));
+       const wchar_t *tmp = wgettext(text.c_str());
+       std::wstring retval = (std::wstring)tmp;
+       delete[] tmp;
+       return retval;
 }
 
-/******************************************************************************/
-inline std::wstring wstrgettext(std::string text) {
-       wchar_t* wlabel = wgettext(text.c_str());
-       std::wstring out = (std::wstring)wlabel;
-       delete[] wlabel;
-       return out;
+inline std::string strgettext(const std::string &text)
+{
+       return gettext(text.c_str());
 }
 
 #endif