COMP: Avoid MACRO redifinition, shared and static should be exclusive

diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h
index 17e13d1a2a3bf23f35c989ec10297371ad567841..580eff940c0dea253d52f55756ca3d36237b44bb 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/j2k.h
+++ b/src/gdcmopenjpeg/libopenjpeg/j2k.h
@@ -28,7 +28,7 @@
 
 #define VERSION "0.0.8"
 
-#if defined(_WIN32) && defined (OPENJPEGDLL)
+#if defined(_WIN32) && defined (OPENJPEGDLL) && !defined(OPENJPEGSTATIC)
 #ifdef gdcmopenjpeg_EXPORTS /*LIBJ2K_EXPORTS*/
 #define LIBJ2K_API __declspec(dllexport)
 #else
@@ -38,7 +38,7 @@
 #define LIBJ2K_API
 #endif
 
-#if defined(_WIN32) && defined (OPENJPEGSTATIC)
+#if defined(_WIN32) && defined (OPENJPEGSTATIC) && !defined(OPENJPEGDLL)
 #define LIBJ2K_API __declspec(dllexport)
 #else
 #define LIBJ2K_API extern