Compile fix for GIF decoder,

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f567f81f72f5ba81a529eabe7d08413ab600e79d..a27d2371c3602ea43da35afd86540356958b7835 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -30,7 +30,7 @@
 #if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \
     defined(__LINUX__) || defined(__sgi ) || \
     defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
 #if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \
     defined(__LINUX__) || defined(__sgi ) || \
     defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \

-    defined(__EMX__)
+    defined(__EMX__) || defined( __VMS )

 
     #define __UNIX_LIKE__
 
 
     #define __UNIX_LIKE__
 


@@ -126,7 +126,9 @@
 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
 // so define it ourselves
 #ifdef __DECCXX
 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
 // so define it ourselves
 #ifdef __DECCXX

-    #define __cplusplus
+#ifndef __VMS
+# define __cplusplus
+#endif

 #endif // __DECCXX
 
 // Resolves linking problems under HP-UX
 #endif // __DECCXX
 
 // Resolves linking problems under HP-UX


@@ -143,6 +145,12 @@
 #endif
 #endif
 
 #endif
 #endif
 

+// "old" GNUWIN32 is the one without Norlander's headers: it lacks the standard
+// Win32 headers and we define the used stuff ourselves for it in
+// wx/msw/gnuwin32/extra.h
+#if defined(__MINGW32__) && !wxUSE_NORLANDER_HEADERS
+    #define __GNUWIN32_OLD__
+#endif

 
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported


@@ -293,7 +301,9 @@
     // NB: of course, this doesn't replace the standard type, because, for
     //     example, overloading based on bool/int parameter doesn't work and
     //     so should be avoided in portable programs
     // NB: of course, this doesn't replace the standard type, because, for
     //     example, overloading based on bool/int parameter doesn't work and
     //     so should be avoided in portable programs

-    typedef unsigned int bool;
+#ifndef VMS
+typedef unsigned int bool;
+#endif

 #endif // bool
 
 typedef short int WXTYPE;
 #endif // bool
 
 typedef short int WXTYPE;