Initial check in of wxApplet code to CVS

[wxWidgets.git] / src / jpeg / jmorecfg.h

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 25862671a5c2fe17df7811a62f9d1138fc114d21..2d8604909460cc0e8402f4b3ff047bba9ad1a6e7 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -155,6 +155,13 @@ typedef unsigned int UINT16;
 typedef short INT16;
 #endif
 
 typedef short INT16;
 #endif
 

+#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
+#include <wx/msw/gccpriv.h>
+#else
+#undef wxCHECK_W32API_VERSION
+#define wxCHECK_W32API_VERSION(maj, min) (0)
+#endif
+

 /* INT32 must hold at least signed 32-bit values. */
 
 /* you may define INT32_DEFINED if it is already defined somewhere */
 /* INT32 must hold at least signed 32-bit values. */
 
 /* you may define INT32_DEFINED if it is already defined somewhere */


@@ -163,8 +170,10 @@ typedef short INT16;
 /* X11/xmd.h correctly defines INT32 */
 #define INT32_DEFINED
 #elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \
 /* X11/xmd.h correctly defines INT32 */
 #define INT32_DEFINED
 #elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \

+      wxCHECK_W32API_VERSION( 0, 5 ) || \

       ((defined(__MINGW32__) || defined(__CYGWIN__)) \
       ((defined(__MINGW32__) || defined(__CYGWIN__)) \

-       && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95))))
+       && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>95))))
+

 /* INT32 is defined in windows.h  for these compilers */
 #define INT32_DEFINED
 #include <windows.h>
 /* INT32 is defined in windows.h  for these compilers */
 #define INT32_DEFINED
 #include <windows.h>