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=cd86a5c79e46f6b62cbe1d73f909474bcd4fe9c8;hb=6b17eb062f567984bf36876ddbb980731b603855;hp=055fc02cf6823f68cf7e1ebe2fbc8e03bd04a9da;hpb=0fe2afcdd153ff2ee8f3ba2b4b02478e154a57df;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 055fc02c..cd86a5c7 100644
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -142,6 +142,7 @@
 
 
 
+#if 0
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 #endif
@@ -174,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;
@@ -186,16 +187,55 @@ typedef unsigned __int64   ulonglong;
 typedef __int64            longlong;
 #else
 #error this is not supposed to happen please report your compiler
-#endif
+#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;
 #else
-#error this is not supposed to happen please report your compiler
-#endif
+typedef unsigned short     ushort;
+typedef unsigned int       uint;
+typedef unsigned long      ulong;
+typedef unsigned char      uchar;
+typedef unsigned __int64   ulonglong;
+typedef __int64            longlong;
+#endif /* GDCM_TYPE_USE_LONG_LONG */
 /* #define  ssize_t    int */
+#endif /* HAVE_SYS_TYPES_H */
+
+
+#cmakedefine JASPERSTATIC
+
+/* a function referenced thru EXTERNs: */
+#if defined( _WIN32 ) && defined (JASPERDLL)
+#define GLOBAL(type)            __declspec(dllexport) type
+#else
+#define GLOBAL(type)            type
+#endif
+
+/* a reference to a GLOBAL function: */
+#if defined(_WIN32) && !defined(JASPERSTATIC)
+#ifdef JASPERDLL
+#define EXTERN(type)            __declspec(dllexport) type
+#else
+#define EXTERN(type)            __declspec(dllimport) type
+#endif
+#else
+#define EXTERN(type)            extern type
 #endif