[svn-r24206] Fix warning message from missing if in configure

2 files changed, 46 insertions, 40 deletions

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index af7a51b..5e2697d 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -565,7 +565,9 @@ IF (NOT APPLE)
   IF (NOT H5_SIZEOF_SSIZE_T)
     SET (H5_SIZEOF_SSIZE_T 0)
   ENDIF (NOT H5_SIZEOF_SSIZE_T)
-  H5_CHECK_TYPE_SIZE (ptrdiff_t    H5_SIZEOF_PTRDIFF_T)
+  IF (NOT WINDOWS)
+    H5_CHECK_TYPE_SIZE (ptrdiff_t    H5_SIZEOF_PTRDIFF_T)
+  ENDIF (NOT WINDOWS)
 ENDIF (NOT APPLE)
 
 H5_CHECK_TYPE_SIZE (off_t          H5_SIZEOF_OFF_T)
@@ -1069,7 +1071,11 @@ H5ConversionTests (H5_ULONG_TO_FLOAT_ACCURATE "Checking IF accurately converting
 # 64-bit machines, where the short program below tests if round-up is
 # correctly handled.
 #
-H5ConversionTests (H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE "Checking IF accurately converting unsigned long long to floating-point values")
+IF (CMAKE_SYSTEM MATCHES "solaris2.*")
+  H5ConversionTests (H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE "Checking IF accurately converting unsigned long long to floating-point values")
+ELSE (CMAKE_SYSTEM MATCHES "solaris2.*")
+  SET(H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE 1)
+ENDIF (CMAKE_SYSTEM MATCHES "solaris2.*")
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can accurately convert
 # 'float' or 'double' to 'unsigned long long' values.
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 5f3764c..d049d25 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -575,62 +575,62 @@
 #cmakedefine H5_PRINTF_LL_WIDTH @H5_PRINTF_LL_WIDTH@
 
 /* The size of `char', as computed by sizeof. */
-#define H5_SIZEOF_CHAR @H5_SIZEOF_CHAR@
+#cmakedefine H5_SIZEOF_CHAR @H5_SIZEOF_CHAR@
 
 /* The size of `double', as computed by sizeof. */
-#define H5_SIZEOF_DOUBLE @H5_SIZEOF_DOUBLE@
+#cmakedefine H5_SIZEOF_DOUBLE @H5_SIZEOF_DOUBLE@
 
 /* The size of `float', as computed by sizeof. */
-#define H5_SIZEOF_FLOAT @H5_SIZEOF_FLOAT@
+#cmakedefine H5_SIZEOF_FLOAT @H5_SIZEOF_FLOAT@
 
 /* The size of `int', as computed by sizeof. */
-#define H5_SIZEOF_INT @H5_SIZEOF_INT@
+#cmakedefine H5_SIZEOF_INT @H5_SIZEOF_INT@
 
 /* The size of `int16_t', as computed by sizeof. */
-#define H5_SIZEOF_INT16_T @H5_SIZEOF_INT16_T@
+#cmakedefine H5_SIZEOF_INT16_T @H5_SIZEOF_INT16_T@
 
 /* The size of `int32_t', as computed by sizeof. */
-#define H5_SIZEOF_INT32_T @H5_SIZEOF_INT32_T@
+#cmakedefine H5_SIZEOF_INT32_T @H5_SIZEOF_INT32_T@
 
 /* The size of `int64_t', as computed by sizeof. */
-#define H5_SIZEOF_INT64_T @H5_SIZEOF_INT64_T@
+#cmakedefine H5_SIZEOF_INT64_T @H5_SIZEOF_INT64_T@
 
 /* The size of `int8_t', as computed by sizeof. */
-#define H5_SIZEOF_INT8_T @H5_SIZEOF_INT8_T@
+#cmakedefine H5_SIZEOF_INT8_T @H5_SIZEOF_INT8_T@
 
 /* The size of `int_fast16_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_FAST16_T @H5_SIZEOF_INT_FAST16_T@
+#cmakedefine H5_SIZEOF_INT_FAST16_T @H5_SIZEOF_INT_FAST16_T@
 
 /* The size of `int_fast32_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_FAST32_T @H5_SIZEOF_INT_FAST32_T@
+#cmakedefine H5_SIZEOF_INT_FAST32_T @H5_SIZEOF_INT_FAST32_T@
 
 /* The size of `int_fast64_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_FAST64_T @H5_SIZEOF_INT_FAST64_T@
+#cmakedefine H5_SIZEOF_INT_FAST64_T @H5_SIZEOF_INT_FAST64_T@
 
 /* The size of `int_fast8_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_FAST8_T @H5_SIZEOF_INT_FAST8_T@
+#cmakedefine H5_SIZEOF_INT_FAST8_T @H5_SIZEOF_INT_FAST8_T@
 
 /* The size of `int_least16_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_LEAST16_T @H5_SIZEOF_INT_LEAST16_T@
+#cmakedefine H5_SIZEOF_INT_LEAST16_T @H5_SIZEOF_INT_LEAST16_T@
 
 /* The size of `int_least32_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_LEAST32_T @H5_SIZEOF_INT_LEAST32_T@
+#cmakedefine H5_SIZEOF_INT_LEAST32_T @H5_SIZEOF_INT_LEAST32_T@
 
 /* The size of `int_least64_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_LEAST64_T @H5_SIZEOF_INT_LEAST64_T@
+#cmakedefine H5_SIZEOF_INT_LEAST64_T @H5_SIZEOF_INT_LEAST64_T@
 
 /* The size of `int_least8_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_LEAST8_T @H5_SIZEOF_INT_LEAST8_T@
+#cmakedefine H5_SIZEOF_INT_LEAST8_T @H5_SIZEOF_INT_LEAST8_T@
 
 #if !defined(__APPLE__)
 /* The size of `size_t', as computed by sizeof. */
-#define H5_SIZEOF_SIZE_T @H5_SIZEOF_SIZE_T@
+#cmakedefine H5_SIZEOF_SIZE_T @H5_SIZEOF_SIZE_T@
 
 /* The size of `ssize_t', as computed by sizeof. */
-#define H5_SIZEOF_SSIZE_T @H5_SIZEOF_SSIZE_T@
+#cmakedefine H5_SIZEOF_SSIZE_T @H5_SIZEOF_SSIZE_T@
 
 /* The size of `long', as computed by sizeof. */
-#define H5_SIZEOF_LONG @H5_SIZEOF_LONG@
+#cmakedefine H5_SIZEOF_LONG @H5_SIZEOF_LONG@
 
 #else
    # if defined(__LP64__) && __LP64__
@@ -646,66 +646,66 @@
 #endif
 
 /* The size of `long double', as computed by sizeof. */
-#define H5_SIZEOF_LONG_DOUBLE @H5_SIZEOF_LONG_DOUBLE@
+#cmakedefine H5_SIZEOF_LONG_DOUBLE @H5_SIZEOF_LONG_DOUBLE@
 
 /* Define size of long long and/or __int64 bit integer type only if the type
    exists.  */
 #if !defined(__APPLE__)
- #define H5_SIZEOF_LONG_LONG @H5_SIZEOF_LONG_LONG@
+ #cmakedefine H5_SIZEOF_LONG_LONG @H5_SIZEOF_LONG_LONG@
 #else
  #define H5_SIZEOF_LONG_LONG 8
 #endif
 
 /* The size of `off64_t', as computed by sizeof. */
-#define H5_SIZEOF_OFF64_T @H5_SIZEOF_OFF64_T@
+#cmakedefine H5_SIZEOF_OFF64_T @H5_SIZEOF_OFF64_T@
 
 /* The size of `off_t', as computed by sizeof. */
-#define H5_SIZEOF_OFF_T @H5_SIZEOF_OFF_T@
+#cmakedefine H5_SIZEOF_OFF_T @H5_SIZEOF_OFF_T@
 
 /* The size of `ptrdiff_t', as computed by sizeof. */
-/* #define H5_SIZEOF_PTRDIFF_T @H5_SIZEOF_PTRDIFF_T@ */
+#cmakedefine H5_SIZEOF_PTRDIFF_T @H5_SIZEOF_PTRDIFF_T@
 
 /* The size of `short', as computed by sizeof. */
-#define H5_SIZEOF_SHORT @H5_SIZEOF_SHORT@
+#cmakedefine H5_SIZEOF_SHORT @H5_SIZEOF_SHORT@
 
 /* The size of `uint16_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT16_T @H5_SIZEOF_UINT16_T@
+#cmakedefine H5_SIZEOF_UINT16_T @H5_SIZEOF_UINT16_T@
 
 /* The size of `uint32_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT32_T @H5_SIZEOF_UINT32_T@
+#cmakedefine H5_SIZEOF_UINT32_T @H5_SIZEOF_UINT32_T@
 
 /* The size of `uint64_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT64_T @H5_SIZEOF_UINT64_T@
+#cmakedefine H5_SIZEOF_UINT64_T @H5_SIZEOF_UINT64_T@
 
 /* The size of `uint8_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT8_T @H5_SIZEOF_UINT8_T@
+#cmakedefine H5_SIZEOF_UINT8_T @H5_SIZEOF_UINT8_T@
 
 /* The size of `uint_fast16_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_FAST16_T @H5_SIZEOF_UINT_FAST16_T@
+#cmakedefine H5_SIZEOF_UINT_FAST16_T @H5_SIZEOF_UINT_FAST16_T@
 
 /* The size of `uint_fast32_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_FAST32_T @H5_SIZEOF_UINT_FAST32_T@
+#cmakedefine H5_SIZEOF_UINT_FAST32_T @H5_SIZEOF_UINT_FAST32_T@
 
 /* The size of `uint_fast64_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_FAST64_T @H5_SIZEOF_UINT_FAST64_T@
+#cmakedefine H5_SIZEOF_UINT_FAST64_T @H5_SIZEOF_UINT_FAST64_T@
 
 /* The size of `uint_fast8_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_FAST8_T @H5_SIZEOF_UINT_FAST8_T@
+#cmakedefine H5_SIZEOF_UINT_FAST8_T @H5_SIZEOF_UINT_FAST8_T@
 
 /* The size of `uint_least16_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_LEAST16_T @H5_SIZEOF_UINT_LEAST16_T@
+#cmakedefine H5_SIZEOF_UINT_LEAST16_T @H5_SIZEOF_UINT_LEAST16_T@
 
 /* The size of `uint_least32_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_LEAST32_T @H5_SIZEOF_UINT_LEAST32_T@
+#cmakedefine H5_SIZEOF_UINT_LEAST32_T @H5_SIZEOF_UINT_LEAST32_T@
 
 /* The size of `uint_least64_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_LEAST64_T @H5_SIZEOF_UINT_LEAST64_T@
+#cmakedefine H5_SIZEOF_UINT_LEAST64_T @H5_SIZEOF_UINT_LEAST64_T@
 
 /* The size of `uint_least8_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_LEAST8_T @H5_SIZEOF_UINT_LEAST8_T@
+#cmakedefine H5_SIZEOF_UINT_LEAST8_T @H5_SIZEOF_UINT_LEAST8_T@
 
 /* The size of `unsigned', as computed by sizeof. */
-#define H5_SIZEOF_UNSIGNED @H5_SIZEOF_UNSIGNED@
+#cmakedefine H5_SIZEOF_UNSIGNED @H5_SIZEOF_UNSIGNED@
 
 /* The size of `__int64', as computed by sizeof. */
 #define H5_SIZEOF___INT64 @H5_SIZEOF___INT64@