Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for METHODDEF definition

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-06 14:40:34 +00:00
parent 746c25ccaf
commit d7c429142d
2 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/jpeg/jmorecfg.h
View File

@@ -208,26 +208,30 @@ typedef unsigned int JDIMENSION;
* or code profilers that require it.
*/
#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: */
#define LOCAL(type) static type
/* a function referenced thru EXTERNs: */
#define GLOBAL(type) type
/* a reference to a GLOBAL function: */
#define EXTERN(type) extern type
#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: */
#define METHODDEF(type) JPEG_METHOD_LINKAGE type JPEG_CALLING_CONV
/* a function used only in its module: */
#define LOCAL(type) static type JPEG_CALLING_CONV
/* a function referenced thru EXTERNs: */
#define GLOBAL(type) type
/* a reference to a GLOBAL function: */
#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.
* Note that the arglist parameter must be parenthesized!