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=cbd78ce91c531545a265b625b7a2637fed2005f4;hpb=acec8150afaff4b0a9dc25410e23394f03ceac2e;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 cbd78ce9..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
 
@@ -219,23 +223,24 @@ typedef __int64            longlong;
 
 
 #cmakedefine JASPERSTATIC
+#cmakedefine JASPERDLL
 
-/* a function referenced thru EXTERNs: */
-#if defined( _WIN32 ) && defined (JPEGDLL)
-#define GLOBAL(type)            __declspec(dllexport) type
+/* a function referenced thru JASEXTERNs: */
+#if defined( _WIN32 ) && defined (JASPERDLL)
+#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