regenerated from template

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

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 54a7d1c447e4ed862caf5a905b0275efcf3629ef..a8fc0e78928b5e7e7f0e00c29362b12be36e471b 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. */
 
-#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
 
+/* 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
@@ -180,6 +186,16 @@ typedef unsigned int JDIMENSION;
  * or code profilers that require it.
  */
 
+#if defined(__VISAGECPP__) && !defined(JPEGLOCAL) /* need this for /common/imagjpeg.obj but not loclly */
+/* a function called through method pointers: */
+#define METHODDEF(type)                static type _Optlink
+/* a function used only in its module: */
+#define LOCAL(type)            static type _Optlink
+/* a function referenced thru EXTERNs: */
+#define GLOBAL(type)           type
+/* a reference to a GLOBAL function: */
+#define EXTERN(type)           extern type _Optlink
+#else
 /* a function called through method pointers: */
 #define METHODDEF(type)                static type
 /* a function used only in its module: */
@@ -188,7 +204,7 @@ typedef unsigned int JDIMENSION;
 #define GLOBAL(type)           type
 /* a reference to a GLOBAL function: */
 #define EXTERN(type)           extern type
-
+#endif
 
 /* This macro is used to declare a "method", that is, a function pointer.
  * We want to supply prototype parameters if the compiler can cope.