move integer type definitions from ntp_rfc2553.h into ntp_types.h where they belong

bk: 405134acL1lHQr7sAveqG4jiwHRSwA

diff --git a/include/ntp_rfc2553.h b/include/ntp_rfc2553.h
index 9fb55e09f2b84897cd426e00d07e49bce45de000..6a7510099639cb9e4d84ae346c861479325f3bf5 100644 (file)
--- a/include/ntp_rfc2553.h
+++ b/include/ntp_rfc2553.h
@@ -86,16 +86,6 @@
 #define PF_INET6       AF_INET6
 #endif
 
-#ifndef HAVE_TYPE_U_INT8_T
-typedef u_char         u_int8_t;
-typedef u_short                u_int16_t;
-typedef u_int32                u_int32_t;
-#endif /* HAVE_TYPE_U_INT8_T */
-
-#ifndef HAVE_TYPE_U_INT64_T
-typedef struct u_int64_t { u_int32 val[2]; } u_int64_t;
-#endif /* HAVE_TYPE_U_INT64_T */
-
 #if !defined(_SS_MAXSIZE) && !defined(_SS_ALIGNSIZE)
 
 #define        _SS_MAXSIZE     128

diff --git a/include/ntp_types.h b/include/ntp_types.h
index 348e95ec162dc950d32e09a650cadf927cd5f01a..1612b72b8bbedeed63cfe23d88ce294d15f49f20 100644 (file)
--- a/include/ntp_types.h
+++ b/include/ntp_types.h
@@ -65,6 +65,16 @@ typedef unsigned int u_int;
 # include "Bletch: what's 32 bits on this machine?"
 #endif /* not sizeof(int) == 4 */
 
+#ifndef HAVE_TYPE_U_INT8_T
+typedef u_char         u_int8_t;
+typedef u_short                u_int16_t;
+typedef u_int32                u_int32_t;
+#endif /* HAVE_TYPE_U_INT8_T */
+
+#ifndef HAVE_TYPE_U_INT64_T
+typedef struct u_int64_t { u_int32 val[2]; } u_int64_t;
+#endif /* HAVE_TYPE_U_INT64_T */
+
 typedef unsigned short associd_t; /* association ID */
 typedef u_int32 keyid_t;       /* cryptographic key ID */
 typedef u_int32 tstamp_t;      /* NTP seconds timestamp */