diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-04-13 11:01:12 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-04-13 11:01:12 +0000 |
| commit | 9e0e3611c52e2130901e474284e0310937fcedd8 (patch) | |
| tree | ee79aa48d4e79795151dfec6d47847d81772e201 /libopenjpeg | |
| parent | 9fba123a7ac6183fb4d4f6b9ba36189d99f67942 (diff) | |
[V2] fixed dllexport definition (credit to vincent torri)
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/openjpeg.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index 5dbb1b25..95482cdd 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -33,17 +33,17 @@ #ifndef OPENJPEG_H #define OPENJPEG_H -#if defined(OPJ_STATIC) || (!defined(WIN32) && !defined(__MINGW32__)) || defined(__WIN32__) +#if defined(OPJ_STATIC) || !defined(_WIN32) #define OPJ_API #define OPJ_CALLCONV #else #define OPJ_CALLCONV __stdcall - #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_EXPORTS || DLL_EXPORT */ +#endif /* !OPJ_STATIC || !_WIN32 */ #ifndef __cplusplus #if defined(HAVE_STDBOOL_H) |