Merged some STC fixes over to the main branch

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

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 2733047bac28d484ffedb0c1c0b5f5c86b82e0c7..5e9510042d3cd02fc95fc42dbabb5382f25fe1bd 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -186,7 +186,7 @@ typedef unsigned int JDIMENSION;
  * or code profilers that require it.
  */
 
  * or code profilers that require it.
  */
 

-#if defined(__VISAGECPP__) && !defined(JPEGLOCAL) /* need this for /common/imagjpeg.obj but not loclly */
+#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: */
 /* a function called through method pointers: */
 #define METHODDEF(type)                static type _Optlink
 /* a function used only in its module: */


@@ -212,12 +212,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


@@ -228,8 +238,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

 
 
 /*
 
 
 /*