ENH: Ok since OJ warnings are not going to be fixed anytime soon remove them

[gdcm.git] / src / gdcmjasper / src / libjasper / include / jasper / jas_config.h.in

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 687e9ecc1cbdda83c92c8ea4454cf64771fcafdf..ef0b7e3306b6239cf7b3aaf53a1df99f6ae5bb7b 100644 (file)
--- 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,29 +217,33 @@ 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 */
 
+/* check how the compiler implement the return of malloc(0) */
+/* jasper does not support the case where it returns NULL */
+#cmakedefine NULL_ON_MALLOC_0
 
 #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