[V2] fixed dllexport definition (credit to vincent torri)

diff --git a/CHANGES b/CHANGES
index 3d4e6e80e8e421dd5038719b922c11d6fd8d2909..d09e8898e7b92328089a4e2062ca8e23edb28e54 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+April 13, 2011
+* [antonin] fixed dllexport definition (credit to vincent torri)
+
 April 12, 2011
 - [antonin] Removed folders mj2, JavaOpenJpeg, jpwl, OPJViewer (not compliant with v2). Removed obsolete windows project files. Removed obsolete Makefiles (only build method currently supported with v2 branch: cmake). Renamed ChangeLog to CHANGES. Renamed License.txt to LICENSE. Removed obsolete README files.
 * [antonin] Fixed internal function names conflict with Jasper (http://code.google.com/p/openjpeg/issues/detail?id=30)

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 5dbb1b2511fa1e38615fa44b4e70963ccf4d7311..95482cdda321417f1fd3785cdc3fce5053c09276 100644 (file)
--- 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)