COMP: Some more fun with sys/types.h declaring a few u* types but not the other...

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
index 2393e78bbcd6f98c9e3bd9b5f7d1d45337e15764..54324011325e2c3150281c4c34fe7a83213526fe 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
@@ -25,24 +25,24 @@
 
 SET(JAS_VERSION "1.701.0")
 
-CHECK_INCLUDE_FILE("dlfcn.h"       HAVE_DLFCN_H)
-CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
+CHECK_INCLUDE_FILE("dlfcn.h"    HAVE_DLFCN_H)
+CHECK_INCLUDE_FILE("fcntl.h"    HAVE_FCNTL_H)
 CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)
+CHECK_INCLUDE_FILE("io.h"       HAVE_IO_H)
 #/* Define to 1 if you have the `m' library (-lm). */
 ##define HAVE_LIBM 1
 
-CHECK_INCLUDE_FILE("limits.h" HAVE_LIMITS_H)
-CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
-CHECK_INCLUDE_FILE("stdbool.h" HAVE_STDBOOL_H)
-CHECK_INCLUDE_FILE("stddef.h" HAVE_STDDEF_H)
-CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
-CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
-CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE("limits.h"    HAVE_LIMITS_H)
+CHECK_INCLUDE_FILE("memory.h"    HAVE_MEMORY_H)
+CHECK_INCLUDE_FILE("stdbool.h"   HAVE_STDBOOL_H)
+CHECK_INCLUDE_FILE("stddef.h"    HAVE_STDDEF_H)
+CHECK_INCLUDE_FILE("stdint.h"    HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("stdlib.h"    HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE("strings.h"   HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("string.h"    HAVE_STRING_H)
+CHECK_INCLUDE_FILE("sys/stat.h"  HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE("unistd.h"    HAVE_UNISTD_H)
 
 #/* Have variable length arrays */
 ##define HAVE_VLA 1
@@ -64,6 +64,10 @@ CHECK_TYPE_SIZE("long"   GDCM_SIZEOF_LONG)
 CHECK_TYPE_SIZE("float"  GDCM_SIZEOF_FLOAT)
 CHECK_TYPE_SIZE("double" GDCM_SIZEOF_DOUBLE)
 
+CHECK_TYPE_SIZE("uint"   GDCM_SIZEOF_UINT)
+CHECK_TYPE_SIZE("ushort" GDCM_SIZEOF_USHORT)
+CHECK_TYPE_SIZE("ulong"  GDCM_SIZEOF_ULONG)
+
 CHECK_TYPE_SIZE("long long" GDCM_SIZEOF_LONG_LONG)
 CHECK_TYPE_SIZE("__int64"   GDCM_SIZEOF___INT64)
 

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 89a1e2d13f9976bcfc5f98d7c763768dc14cd1af..afabada9e06679f7a9630684aa78a4d00919945c 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -189,7 +189,20 @@ typedef __int64            longlong;
 #error this is not supposed to happen please report your compiler
 #endif //GDCM_TYPE_USE___INT64
 #else
+#cmakedefine HAVE_GDCM_SIZEOF_UINT
+#cmakedefine HAVE_GDCM_SIZEOF_USHORT
+#cmakedefine HAVE_GDCM_SIZEOF_ULONG
+
 #ifdef GDCM_TYPE_USE_LONG_LONG
+#ifndef HAVE_GDCM_SIZEOF_USHORT
+typedef unsigned short     ushort;
+#endif
+#ifndef HAVE_GDCM_SIZEOF_UINT
+typedef unsigned int       uint;
+#endif
+#ifndef HAVE_GDCM_SIZEOF_ULONG
+typedef unsigned long      ulong;
+#endif
 typedef unsigned char      uchar;
 typedef unsigned long long ulonglong;
 typedef long long          longlong;