COMP: Ok coffee was bad...

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