COMP: trying to simplify the shared lib on win32... still a mess

[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..64aece3f2855862791442570138f1d3d48e2dd5c 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -175,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;
@@ -187,7 +187,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,15 +213,16 @@ 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 EXTERNs: */
-#if defined( _WIN32 ) && defined (JPEGDLL)
+#if defined( _WIN32 ) && defined (JASPERDLL)
 #define GLOBAL(type)            __declspec(dllexport) type
 #else
 #define GLOBAL(type)            type