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=cc57eed72926fd18985a6899b817894d4d505766;hb=1160ad545f6abeb4402a83b9e496552a26f50e3b;hp=3063cf6d4e79e7b27bc4521853f7d4c05146a8b9;hpb=3abb6c11e8de2088367ed37676e5748e05084242;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 3063cf6d..cc57eed7 100644
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -16,6 +16,10 @@
 #undef DEBUG_OVERFLOW
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER < 1300
+#  pragma warning ( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#endif
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #cmakedefine HAVE_DLFCN_H
 
@@ -175,8 +179,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,7 +191,7 @@ 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
@@ -213,18 +217,30 @@ 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 EXTERN(type)            __declspec(dllexport) type
+#define JASEXTERN(type)            __declspec(dllexport) type
 #else
-#define EXTERN(type)            __declspec(dllimport) type
+#define JASEXTERN(type)            __declspec(dllimport) type
 #endif
 #else
-#define EXTERN(type)            extern type
+#define JASEXTERN(type)            extern type
 #endif