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=64aece3f2855862791442570138f1d3d48e2dd5c;hpb=87ac02b456a9c2044b3eab23aa5d9e8dbfd12f29;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 64aece3f..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
 
@@ -221,22 +225,22 @@ typedef __int64            longlong;
 #cmakedefine JASPERSTATIC
 #cmakedefine JASPERDLL
 
-/* a function referenced thru EXTERNs: */
+/* a function referenced thru JASEXTERNs: */
 #if defined( _WIN32 ) && defined (JASPERDLL)
-#define GLOBAL(type)            __declspec(dllexport) type
+#define JASGLOBAL(type)            __declspec(dllexport) type
 #else
-#define GLOBAL(type)            type
+#define JASGLOBAL(type)            type
 #endif
 
-/* a reference to a GLOBAL function: */
+/* 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