Added chapter on collection and container classes to contents

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

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 3a774dc7fb099b06cafa2be334506eaa5dabdc34..5e9510042d3cd02fc95fc42dbabb5382f25fe1bd 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -158,12 +158,12 @@ typedef short INT16;
 /* 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)                     /* X11/xmd.h correctly defines INT32 */
+#if !defined(XMD_H) && !(_MSC_VER >= 1200) && !(__BORLANDC__ >= 0x550)  /* X11/xmd.h correctly defines INT32 */
 typedef long INT32;
 #endif
 
 /* Added JACS 23/4/99, to get INT32 definition */
-#if (_MSC_VER >= 1200)
+#if (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550)
 #include <windows.h>
 #endif
 
@@ -186,16 +186,16 @@ typedef unsigned int JDIMENSION;
  * or code profilers that require it.
  */
 
-//#if defined(__VISAGECPP__)
-///* 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
+#if defined(__VISAGECPP__) /* 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: */
@@ -204,9 +204,7 @@ typedef unsigned int JDIMENSION;
 #define GLOBAL(type)           type
 /* a reference to a GLOBAL function: */
 #define EXTERN(type)           extern type
-//#endif
-
-
+#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.
@@ -214,12 +212,22 @@ typedef unsigned int JDIMENSION;
  * 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
 
+#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
@@ -230,8 +238,10 @@ typedef unsigned int JDIMENSION;
 #ifdef NEED_FAR_POINTERS
 #define FAR  far
 #else
+#ifndef FAR
 #define FAR
 #endif
+#endif
 
 
 /*