reverted Julian's unintentional breakage of wxChoice

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

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 54a7d1c447e4ed862caf5a905b0275efcf3629ef..29b33d02354c16dcffac024fd5aa491a75dd400d 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -155,12 +155,40 @@ 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. */
 
 /* INT32 must hold at least signed 32-bit values. */
 

-#ifndef XMD_H                  /* X11/xmd.h correctly defines 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
+/* Note: GnuPRO 00r1 should be tested because it does NOT define INT32 in windows.h */
+/* For this compiler, set the following test to 0. */
+#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) \
+      || wxCHECK_W32API_VERSION( 0, 5 ) \
+      || ((defined(__MINGW32__) || defined(__CYGWIN__)) \
+      && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))) \
+      || (defined(__MWERKS__) && defined(__WXMSW__))
+
+/* INT32 is defined in windows.h  for these compilers */
+#define INT32_DEFINED
+#include <windows.h>
+#endif
+#endif /* !INT32_DEFINED */
+
+#ifndef INT32_DEFINED

 typedef long INT32;
 #endif
 
 typedef long INT32;
 #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


@@ -180,15 +208,29 @@ typedef unsigned int JDIMENSION;
  * or code profilers that require it.
  */
 
  * or code profilers that require it.
  */
 

+#if defined(__VISAGECPP__)
+#define JPEG_CALLING_CONV _Optlink
+#else /* !Visual Age C++ */
+#define JPEG_CALLING_CONV
+#endif
+
+/* We can't declare a static function as extern "C" as we need to do in C++
+ * programs, so suppress static in METHODDEF when using C++.
+ */
+#if defined(__cplusplus)
+#define JPEG_METHOD_LINKAGE
+#else /* !__cplusplus */
+#define JPEG_METHOD_LINKAGE static
+#endif
+

 /* a function called through method pointers: */
 /* a function called through method pointers: */

-#define METHODDEF(type)                static type
+#define METHODDEF(type)                JPEG_METHOD_LINKAGE type JPEG_CALLING_CONV

 /* a function used only in its module: */
 /* a function used only in its module: */

-#define LOCAL(type)            static type
+#define LOCAL(type)            static type JPEG_CALLING_CONV

 /* a function referenced thru EXTERNs: */
 #define GLOBAL(type)           type
 /* a reference to a GLOBAL function: */
 /* a function referenced thru EXTERNs: */
 #define GLOBAL(type)           type
 /* a reference to a GLOBAL function: */

-#define EXTERN(type)           extern type
-
+#define EXTERN(type)           extern type JPEG_CALLING_CONV

 
 /* This macro is used to declare a "method", that is, a function pointer.
  * We want to supply prototype parameters if the compiler can cope.
 
 /* This macro is used to declare a "method", that is, a function pointer.
  * We want to supply prototype parameters if the compiler can cope.


@@ -196,12 +238,22 @@ typedef unsigned int JDIMENSION;
  * Again, you can customize this if you need special linkage keywords.
  */
 
  * Again, you can customize this if you need special linkage keywords.
  */
 

+#if defined(__VISAGECPP__) /* need this for /common/imagjpeg.obj but not loclly */
+#ifdef HAVE_PROTOTYPES
+#define JMETHOD(type,methodname,arglist)  type (_Optlink *methodname) arglist
+#else
+#define JMETHOD(type,methodname,arglist)  type (_Optlink *methodname) ()
+#endif
+
+#else
+

 #ifdef HAVE_PROTOTYPES
 #define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
 #else
 #define JMETHOD(type,methodname,arglist)  type (*methodname) ()
 #endif
 
 #ifdef HAVE_PROTOTYPES
 #define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
 #else
 #define JMETHOD(type,methodname,arglist)  type (*methodname) ()
 #endif
 

+#endif

 
 /* Here is the pseudo-keyword for declaring pointers that must be "far"
  * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
 
 /* Here is the pseudo-keyword for declaring pointers that must be "far"
  * on 80x86 machines.  Most of the specialized coding for 80x86 is handled


@@ -212,8 +264,10 @@ typedef unsigned int JDIMENSION;
 #ifdef NEED_FAR_POINTERS
 #define FAR  far
 #else
 #ifdef NEED_FAR_POINTERS
 #define FAR  far
 #else

+#ifndef FAR

 #define FAR
 #endif
 #define FAR
 #endif

+#endif

 
 
 /*
 
 
 /*