From c6ba69601063d700de0937554bc79edfe8f6cd30 Mon Sep 17 00:00:00 2001 From: malaterre Date: Mon, 24 Oct 2005 21:06:16 +0000 Subject: [PATCH] COMP: Ok coffee was bad... --- src/gdcmopenjpeg/libopenjpeg/j2k.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h index 580eff94..c6a66b29 100644 --- 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 -- 2.48.1