From: malaterre <malaterre>
Date: Mon, 24 Oct 2005 20:57:36 +0000 (+0000)
Subject: COMP: Avoid MACRO redifinition, shared and static should be exclusive
X-Git-Tag: OpenJPEG.Version1.2~192
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e8e78ebfc4f1c5f51a06d1092abe572c955bfdd8;p=gdcm.git

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 17e13d1a..580eff94 100644
--- 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