X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a1c661cdb54d0a7e12d0724760cf80d7e478bf..9802983f157c32177e92e8c0f6b1ce44aec0ebca:/include/wx/wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 32b9a24d1d..54bab1f6ea 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -87,12 +87,17 @@
         /* Cygwin versions, wchar.h requires sys/types.h */
         #ifdef __CYGWIN__
             #include <sys/types.h>
-            extern "C" {
+            #ifdef __cplusplus
+                extern "C" {
+            #endif
         #endif /* Cygwin */
-                #include <wchar.h>
-        #ifdef __CYGWIN__
+
+        #include <wchar.h>
+
+        #if defined(__CYGWIN__) && defined(__cplusplus)
             }
-        #endif /* Cygwin */
+        #endif /* Cygwin and C++ */
+
     #elif defined(HAVE_WCSTR_H)
         /* old compilers have relevant declarations here */
         #include <wcstr.h>
@@ -763,7 +768,11 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
    headers, so we need to declare it ourselves to be able to use it.
  */
 #if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
+#ifdef __cplusplus
     extern "C"
+#else
+    extern
+#endif
     int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #endif /* !HAVE_VSNPRINTF_DECL */