Forgot to put the previous (v)snprintf commit inside '#ifdef __cplusplus' which

is needed for the inline function.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 6c536fde9bad14e55ae9723be07e25714d4b4ab9..caeb9074a91a17838b1ba3fa9729954089d4124e 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -805,7 +805,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
 /* Wrapper for vsnprintf if it's 3rd parameter is non-const. Note: the
  * same isn't done for snprintf below, the builtin wxSnprintf_ is used
  * instead since it's already a simple wrapper */
 /* Wrapper for vsnprintf if it's 3rd parameter is non-const. Note: the
  * same isn't done for snprintf below, the builtin wxSnprintf_ is used
  * instead since it's already a simple wrapper */

-#ifdef HAVE_BROKEN_VSNPRINTF_DECL
+#if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL

     inline int wx_fixed_vsnprintf(char *str, size_t size, const char *format, va_list ap)
     {
         return vsnprintf(str, size, (char*)format, ap);
     inline int wx_fixed_vsnprintf(char *str, size_t size, const char *format, va_list ap)
     {
         return vsnprintf(str, size, (char*)format, ap);


@@ -846,10 +846,10 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
             #endif
         #endif
         #if defined(HAVE_VSNPRINTF) || defined(__MWERKS__) || defined(__WATCOMC__)
             #endif
         #endif
         #if defined(HAVE_VSNPRINTF) || defined(__MWERKS__) || defined(__WATCOMC__)

-            #ifndef HAVE_BROKEN_VSNPRINTF_DECL
-                #define wxVsnprintf_    vsnprintf
-            #else
+            #if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL

                 #define wxVsnprintf_    wx_fixed_vsnprintf
                 #define wxVsnprintf_    wx_fixed_vsnprintf

+            #else
+                #define wxVsnprintf_    vsnprintf

             #endif
         #endif
     #endif
             #endif
         #endif
     #endif