* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build.

bk: 4b63d104kI__V82BklejnmIw_ThsDQ

diff --git a/ChangeLog b/ChangeLog
index 728ca0a7656bedd183310a4dd006b17f0f2cfb70..250376378af6bdb9e483e7495bd305139c0274b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * [Bug 1468] 'make install' broken for root on default NFS mount.
+* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build.
 (4.2.7p11) 2010/01/28 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 47] Debugging and logging do not work after a fork.
 * [Bug 1010] getaddrinfo() could block and thus should not be called by

diff --git a/include/ntp_types.h b/include/ntp_types.h
index c526df0af649c1ccdd80d0ebc1c43854587853eb..70e798c12743c51937418fe853ad4749602a0b46 100644 (file)
--- a/include/ntp_types.h
+++ b/include/ntp_types.h
@@ -7,6 +7,9 @@
 #ifndef NTP_TYPES_H
 #define NTP_TYPES_H
 
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <sys/types.h>
 #include "ntp_machine.h"
 
@@ -41,13 +44,12 @@
 #if defined(VMS)
 #include <socket.h>
 typedef unsigned int u_int;
-/*
- * Note: VMS DECC has  long == int  (even on __alpha),
- *      so the distinction below doesn't matter
- */
 #endif /* VMS */
 
-#if (SIZEOF_INT == 4)
+#ifdef HAVE_UINT32_T
+  typedef      int32_t         int32;
+  typedef      uint32_t        u_int32;
+#elif (SIZEOF_INT == 4)
 # ifndef int32
    typedef     int             int32;
 # endif
@@ -65,7 +67,7 @@ typedef unsigned int u_int;
 # else /* SIZEOF_LONG != 4 */
 #  include "Bletch: what's 32 bits on this machine?"
 # endif
-#endif /* SIZEOF_INT != 4 */
+#endif /* !HAVE_UINT32_t && SIZEOF_INT != 4 */
 
 typedef u_char         ntp_u_int8_t;
 typedef u_short                ntp_u_int16_t;