From e8e78ebfc4f1c5f51a06d1092abe572c955bfdd8 Mon Sep 17 00:00:00 2001 From: malaterre Date: Mon, 24 Oct 2005 20:57:36 +0000 Subject: [PATCH] COMP: Avoid MACRO redifinition, shared and static should be exclusive --- src/gdcmopenjpeg/libopenjpeg/j2k.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.48.1