X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/896e226aa260920835f70f4b2689d92cfc1615e8..9f542367b72dd900a914c163df7f23ca5e79a60c:/src/common/wxchar.cpp?ds=inline diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index 94b56cde9e..9044dfb689 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxchar.h" -#endif - // =========================================================================== // headers, declarations, constants // =========================================================================== @@ -65,7 +61,7 @@ using namespace std ; size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) { // assume that we have mbsrtowcs() too if we have wcsrtombs() -#if HAVE_WCSRTOMBS +#ifdef HAVE_WCSRTOMBS mbstate_t mbstate; memset(&mbstate, 0, sizeof(mbstate_t)); #endif @@ -91,7 +87,7 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n) { -#if HAVE_WCSRTOMBS +#ifdef HAVE_WCSRTOMBS mbstate_t mbstate; memset(&mbstate, 0, sizeof(mbstate_t)); #endif @@ -102,14 +98,14 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n) if (n) *buf = '\0'; return 0; } -#if HAVE_WCSRTOMBS +#ifdef HAVE_WCSRTOMBS return wcsrtombs(buf, &pwz, n, &mbstate); #else return wxWcstombs(buf, pwz, n); #endif } -#if HAVE_WCSRTOMBS +#ifdef HAVE_WCSRTOMBS return wcsrtombs((char *) NULL, &pwz, 0, &mbstate); #else return wxWcstombs((char *) NULL, pwz, 0);