[trunk] fix compilation on OS where ssize_t is not defined.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f5f66e69ff1bf6f6b43555170a5ca901d88cc7e..22dff8fd86ab6c363c8af75be0574dbf0ff578a3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,6 +209,9 @@ IF(BUILD_CODEC OR BUILD_MJ2)
   ADD_SUBDIRECTORY(applications)
 ENDIF (BUILD_CODEC OR BUILD_MJ2)
 
+include(CheckTypeSize)
+CHECK_TYPE_SIZE(ssize_t     SSIZE_T)
+
 #-----------------------------------------------------------------------------
 # opj_config.h generation (2/2)
 CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"

diff --git a/libopenjpeg/opj_stdint.h b/libopenjpeg/opj_stdint.h
index cf69e9106774626b6b6f607f331a2bcb19dbe6fb..36731167aacb4bf8a7debbac3d1d29ae8c39045d 100644 (file)
--- a/libopenjpeg/opj_stdint.h
+++ b/libopenjpeg/opj_stdint.h
@@ -48,4 +48,9 @@ typedef size_t        OPJ_SIZE_T;
 /* 64-bit file offset type */
 typedef int64_t OPJ_OFF_T;
 
+#ifndef HAVE_SSIZE_T
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #endif /* OPJ_STDINT_H */

diff --git a/opj_config.h.cmake.in b/opj_config.h.cmake.in
index c462429b771686657b8b427da1e1a715f23470d1..e5ac38e4aef643067f97f18b007e5b821607cae6 100644 (file)
--- a/opj_config.h.cmake.in
+++ b/opj_config.h.cmake.in
@@ -14,6 +14,7 @@
 #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