From 4c62c0aa8af0f0501d268c7f2036592d7f702096 Mon Sep 17 00:00:00 2001
From: James Laird <jlaird@hdfgroup.org>
Date: Wed, 7 Feb 2007 09:22:34 -0500
Subject: [svn-r13252] Moved definition of uint32_t from H5private.h to
 H5public.h, since it's now used in H5Opublic.h.

This should fix build errors on Windows.

Tested on kagiso; will test on Windows immediately after checkin.
---
 src/H5private.h | 17 +----------------
 src/H5public.h  | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/H5private.h b/src/H5private.h
index 8a029cb..08694a6 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -411,22 +411,7 @@
 #   error "nothing appropriate for int32_t"
 #endif
 
-#if H5_SIZEOF_UINT32_T>=4
-#elif H5_SIZEOF_SHORT>=4
-    typedef short uint32_t;
-#   undef H5_SIZEOF_UINT32_T
-#   define H5_SIZEOF_UINT32_T H5_SIZEOF_SHORT
-#elif H5_SIZEOF_INT>=4
-    typedef unsigned int uint32_t;
-#   undef H5_SIZEOF_UINT32_T
-#   define H5_SIZEOF_UINT32_T H5_SIZEOF_INT
-#elif H5_SIZEOF_LONG>=4
-    typedef unsigned long uint32_t;
-#   undef H5_SIZEOF_UINT32_T
-#   define H5_SIZEOF_UINT32_T H5_SIZEOF_LONG
-#else
-#   error "nothing appropriate for uint32_t"
-#endif
+/* Definition of uint32_t was moved to H5public.h */
 
 /* Definition of int64_t was moved to H5public.h */
 /* Definition of uint64_t was moved to H5public.h */
diff --git a/src/H5public.h b/src/H5public.h
index 3101123..1910efe 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -207,6 +207,26 @@ typedef ssize_t			hssize_t;
 #endif
 #define HADDR_MAX		(HADDR_UNDEF-1)
 
+/* uint32_t type is used for creation order field for messages.  It may be
+ * defined in Posix.1g, otherwise it is defined here.
+ */
+#if H5_SIZEOF_UINT32_T>=4
+#elif H5_SIZEOF_SHORT>=4
+    typedef short uint32_t;
+#   undef H5_SIZEOF_UINT32_T
+#   define H5_SIZEOF_UINT32_T H5_SIZEOF_SHORT
+#elif H5_SIZEOF_INT>=4
+    typedef unsigned int uint32_t;
+#   undef H5_SIZEOF_UINT32_T
+#   define H5_SIZEOF_UINT32_T H5_SIZEOF_INT
+#elif H5_SIZEOF_LONG>=4
+    typedef unsigned long uint32_t;
+#   undef H5_SIZEOF_UINT32_T
+#   define H5_SIZEOF_UINT32_T H5_SIZEOF_LONG
+#else
+#   error "nothing appropriate for uint32_t"
+#endif
+
 /* int64_t type is used for creation order field for links.  It may be
  * defined in Posix.1g, otherwise it is defined here.
  */
-- 
cgit v0.12