*FIX: gdcmjpeg -> gdcmljpeg

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index cc80d9e9e7cf87a04170d965ab7e74f1d733116c..3db17d81b59fb29dbe1fe43459f8c8604ff92c07 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -13,14 +13,30 @@
 #pragma warning ( disable : 4786 )
 //'identifier' : decorated name length exceeded, name was truncated
 #pragma warning ( disable : 4503 )
+// C++ exception specification ignored except to indicate a 
+// function is not __declspec(nothrow)
+#pragma warning ( disable : 4290 )
+// signed/unsigned mismatch
+#pragma warning ( disable : 4018 )
+// return type for 'identifier' is '' (ie; not a UDT or reference to UDT. Will
+// produce errors if applied using infix notation
+#pragma warning ( disable : 4284 )
 #endif //_MSC_VER
 
 #ifdef __GNUC__
+#ifndef HAVE_NO_STDINT_H
 #include <stdint.h>
 #define guint16 uint16_t
 #define guint32 uint32_t
 #define gint16  int16_t
 #define gint32  int32_t
+#else
+typedef  unsigned short guint16;
+typedef  unsigned int   guint32;
+typedef  short                 gint16;
+typedef  int                   gint32;
+#define UINT32_MAX    (4294967295U)
+#endif //HAVE_NO_STDINT_H
 #endif
 
 #ifdef _MSC_VER 
@@ -52,5 +68,8 @@ enum FileType {
       ACR_LIBIDO
 };
 
+//For now gdcm is not willing cmake, try to be more quiet
+//#cmakedefine GDCM_NO_ANSI_STRING_STREAM
+
 
 #endif