diff options
| author | Antonin Descampe <antonin@gmail.com> | 2010-11-25 11:58:26 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2010-11-25 11:58:26 +0000 |
| commit | 389166e86e14a3a09ccf3d28ca0ee64968c5de45 (patch) | |
| tree | 484795d3ca90f83d4ba6eb7001098ac4622f0b7a /libopenjpeg/openjpeg.h | |
| parent | 2b31495723e04ef79395c718b422d6fa6e6e1979 (diff) | |
fix compilation and DLL creation of libopenjpeg with MSYS/MinGW (from vincent.torri, see issue 47 on googlecode)
Diffstat (limited to 'libopenjpeg/openjpeg.h')
| -rw-r--r-- | libopenjpeg/openjpeg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index b2ade89c..101c7e8b 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -39,7 +39,7 @@ ========================================================== */ -#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__)) +#if defined(OPJ_STATIC) || !defined(_WIN32) #define OPJ_API #define OPJ_CALLCONV #else @@ -52,12 +52,12 @@ that uses this DLL. This way any other project whose source files include this f OPJ_API functions as being imported from a DLL, wheras this DLL sees symbols defined with this macro as being exported. */ -#ifdef OPJ_EXPORTS +#if defined(OPJ_EXPORTS) || defined(DLL_EXPORT) #define OPJ_API __declspec(dllexport) #else #define OPJ_API __declspec(dllimport) #endif /* OPJ_EXPORTS */ -#endif /* !OPJ_STATIC || !WIN32 */ +#endif /* !OPJ_STATIC || !_WIN32 */ #ifndef __cplusplus #if defined(HAVE_STDBOOL_H) |