TRUE not true; FALSE not false

[wxWidgets.git] / include / wx / wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index a3764e8a9991ab31f3756e492d0439b78fb50154..31bbb35f476db8f1695a556f4eef400486e581e4 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -576,7 +576,10 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use
  */
 #ifndef wxVsnprintf_
     #if wxUSE_UNICODE
  */
 #ifndef wxVsnprintf_
     #if wxUSE_UNICODE

-        #if defined(HAVE_VSWPRINTF)
+        #if defined(HAVE__VSNWPRINTF)
+            #define wxVsnprintf_    _vsnwprintf
+        /* MinGW?MSVCRT has the wrong vswprintf */
+        #elif defined(HAVE_VSWPRINTF) && !defined(__MINGW32__)

             #define wxVsnprintf_    vswprintf
         #endif
     #else // ASCII
             #define wxVsnprintf_    vswprintf
         #endif
     #else // ASCII


@@ -590,10 +593,12 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use
     #endif
 #endif // wxVsnprintf_ not defined yet
 
     #endif
 #endif // wxVsnprintf_ not defined yet
 

-#ifndef wxVsnprintf_
+#ifndef wxSnprintf_

     // no [v]snprintf(), cook our own
     WXDLLEXPORT int wxSnprintf_(wxChar *buf, size_t len, const wxChar *format,
                                 ...) ATTRIBUTE_PRINTF_3;
     // no [v]snprintf(), cook our own
     WXDLLEXPORT int wxSnprintf_(wxChar *buf, size_t len, const wxChar *format,
                                 ...) ATTRIBUTE_PRINTF_3;

+#endif
+#ifndef wxVsnprintf_

     WXDLLEXPORT int wxVsnprintf_(wxChar *buf, size_t len, const wxChar *format,
                                  va_list argptr);
 #endif
     WXDLLEXPORT int wxVsnprintf_(wxChar *buf, size_t len, const wxChar *format,
                                  va_list argptr);
 #endif