fixed (?) mingw32/cygwin compilation

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

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 5e9510042d3cd02fc95fc42dbabb5382f25fe1bd..853a8da9b752ff438049eb4697b08eaad5938e1a 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -157,16 +157,26 @@ typedef short INT16;
 
 /* INT32 must hold at least signed 32-bit values. */
 
 
 /* INT32 must hold at least signed 32-bit values. */
 

-/* Modified JACS 23/4/99. 1200 means VC++ 6 */
-#if !defined(XMD_H) && !(_MSC_VER >= 1200) && !(__BORLANDC__ >= 0x550)  /* X11/xmd.h correctly defines INT32 */
-typedef long INT32;
+/* you may define INT32_DEFINED if it is already defined somewhere */
+#ifndef INT32_DEFINED
+#ifdef XMD_H
+/* X11/xmd.h correctly defines INT32 */
+#define INT32_DEFINED
+#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \
+      ((defined(__MINGW32__) || defined(__CYGWIN__)) \
+       && ((__GNUC__>=2) && (__GNUC_MINOR__>=95)))
+/* INT32 is defined in windows.h  for these compilers */
+#define INT32_DEFINED
+#include <windows.h>

 #endif
 #endif

+#endif /* !INT32_DEFINED */

 
 

-/* Added JACS 23/4/99, to get INT32 definition */
-#if (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550)
-#include <windows.h>
+#ifndef INT32_DEFINED
+typedef long INT32;

 #endif
 
 #endif
 

+#undef INT32_DEFINED
+

 /* Datatype used for image dimensions.  The JPEG standard only supports
  * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
  * "unsigned int" is sufficient on all machines.  However, if you need to
 /* Datatype used for image dimensions.  The JPEG standard only supports
  * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
  * "unsigned int" is sufficient on all machines.  However, if you need to