X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Finclude%2Fjasper%2Fjas_config.h.in;h=62f2fe58776e7e2ca01c9988df9fe6594b8814e2;hb=f8b873378e1f3f9eb7c28c797e67fce574003a8e;hp=89a1e2d13f9976bcfc5f98d7c763768dc14cd1af;hpb=e269f5d3989094102d760a9b14e749176345557a;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
index 89a1e2d1..62f2fe58 100644
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -175,8 +175,8 @@
 #cmakedefine GDCM_TYPE_CONVERT_UI64_TO_DOUBLE
 
 
-// On win32 there is no long long therefore use __int64 instead
-//
+/* On win32 there is no long long therefore use __int64 instead */
+
 #ifndef HAVE_SYS_TYPES_H
 typedef unsigned short     ushort;
 typedef unsigned int       uint;
@@ -187,9 +187,22 @@ typedef unsigned __int64   ulonglong;
 typedef __int64            longlong;
 #else
 #error this is not supposed to happen please report your compiler
-#endif //GDCM_TYPE_USE___INT64
+#endif /*GDCM_TYPE_USE___INT64*/
 #else
+#cmakedefine HAVE_GDCM_SIZEOF_UINT
+#cmakedefine HAVE_GDCM_SIZEOF_USHORT
+#cmakedefine HAVE_GDCM_SIZEOF_ULONG
+
 #ifdef GDCM_TYPE_USE_LONG_LONG
+#ifndef HAVE_GDCM_SIZEOF_USHORT
+typedef unsigned short     ushort;
+#endif
+#ifndef HAVE_GDCM_SIZEOF_UINT
+typedef unsigned int       uint;
+#endif
+#ifndef HAVE_GDCM_SIZEOF_ULONG
+typedef unsigned long      ulong;
+#endif
 typedef unsigned char      uchar;
 typedef unsigned long long ulonglong;
 typedef long long          longlong;
@@ -200,9 +213,31 @@ typedef unsigned long      ulong;
 typedef unsigned char      uchar;
 typedef unsigned __int64   ulonglong;
 typedef __int64            longlong;
-#endif // GDCM_TYPE_USE_LONG_LONG
+#endif /* GDCM_TYPE_USE_LONG_LONG */
 /* #define  ssize_t    int */
-#endif // HAVE_SYS_TYPES_H
+#endif /* HAVE_SYS_TYPES_H */
+
+
+#cmakedefine JASPERSTATIC
+#cmakedefine JASPERDLL
+
+/* a function referenced thru JASEXTERNs: */
+#if defined( _WIN32 ) && defined (JASPERDLL)
+#define JASGLOBAL(type)            __declspec(dllexport) type
+#else
+#define JASGLOBAL(type)            type
+#endif
+
+/* a reference to a JASGLOBAL function: */
+#if defined(_WIN32) && !defined(JASPERSTATIC)
+#ifdef JASPERDLL
+#define JASEXTERN(type)            __declspec(dllexport) type
+#else
+#define JASEXTERN(type)            __declspec(dllimport) type
+#endif
+#else
+#define JASEXTERN(type)            extern type
+#endif
 
 
 #endif