[b2.x.x] backport into 2.x.x the rev 2254 of trunk

CMakeLists.txt

@@ -192,9 +192,6 @@ 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)
-# ssize_t
-include(CheckTypeSize)
-CHECK_TYPE_SIZE(ssize_t     SSIZE_T)
 
 # Enable Large file support
 include(TestLargeFiles)

src/lib/openjp2/opj_config.h.cmake.in

@@ -1,9 +1,10 @@
 /* create config.h for CMake */
+#cmakedefine OPJ_HAVE_STDINT_H @HAVE_STDINT_H@
+
 #define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
 
 #cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
 #cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@
-#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@
 #cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@
 #cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@
 #cmakedefine HAVE_STRING_H @HAVE_STRING_H@
@@ -14,7 +15,6 @@
 #cmakedefine HAVE_PNG_H @HAVE_PNG_H@
 #cmakedefine HAVE_LIBTIFF @HAVE_LIBTIFF@
 #cmakedefine HAVE_TIFF_H @HAVE_TIFF_H@
-#cmakedefine HAVE_SSIZE_T @HAVE_SSIZE_T@
 
 #cmakedefine _LARGEFILE_SOURCE
 #cmakedefine _LARGE_FILES

src/lib/openjp2/opj_stdint.h

@@ -27,7 +27,7 @@
 #define OPJ_STDINT_H
 
 #include "opj_config.h"
-#ifdef HAVE_STDINT_H
+#ifdef OPJ_HAVE_STDINT_H
 #include <stdint.h>
 #else
 #if defined(_WIN32)
@@ -44,13 +44,4 @@ typedef unsigned __int64  uint64_t;
 #endif
 #endif
 
-#ifndef HAVE_SSIZE_T
-#if defined(_WIN32)
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#else
-#error SSIZE_T is undefined
-#endif /* _WIN32 */
-#endif
-
 #endif /* OPJ_STDINT_H */