no more assert failure in GetSelection() if there is no selection

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

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 54a7d1c447e4ed862caf5a905b0275efcf3629ef..8275eb093fa06ae297e60f6866e93517ff7bfa29 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -157,10 +157,16 @@ typedef short INT16;
 
 /* INT32 must hold at least signed 32-bit values. */
 
 
 /* INT32 must hold at least signed 32-bit values. */
 

-#ifndef XMD_H                  /* X11/xmd.h correctly defines INT32 */
+/* Modified JACS 23/4/99. 1200 means VC++ 6 */
+#if !defined(XMD_H) && !(_MSC_VER >= 1200)                     /* X11/xmd.h correctly defines INT32 */

 typedef long INT32;
 #endif
 
 typedef long INT32;
 #endif
 

+/* Added JACS 23/4/99, to get INT32 definition */
+#if (_MSC_VER >= 1200)
+#include <windows.h>
+#endif
+

 /* 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