more merge cleanup

bk: 4ed171086XDfojqB-ikZOhM8db85cQ

diff --git a/include/lib_strbuf.h b/include/lib_strbuf.h
index 3f233288a24341d0b704cc1fc61f922409f64d93..5ee92d6f83417dcd9cd1fcf98ed0c2db4026ed21 100644 (file)
--- a/include/lib_strbuf.h
+++ b/include/lib_strbuf.h
@@ -1,6 +1,8 @@
 /*
  * lib_strbuf.h - definitions for routines which use the common string buffers
  */
+#ifndef LIB_STRBUF_H
+#define LIB_STRBUF_H
 
 #include <ntp_types.h>
 #include <ntp_malloc.h>                        /* for ZERO() */
@@ -26,3 +28,5 @@ extern int lib_inited;
                (bufp) = &lib_stringbuf[lib_nextbuf++][0];      \
                lib_nextbuf %= COUNTOF(lib_stringbuf);          \
        } while (FALSE)
+
+#endif /* LIB_STRBUF_H */

diff --git a/include/ntp_fp.h b/include/ntp_fp.h
index c726748e589ac6eb7180d52288dd14a1738ee9f1..b1e91266215669eb3ef1124479d299148229dd25 100644 (file)
--- a/include/ntp_fp.h
+++ b/include/ntp_fp.h
@@ -265,7 +265,7 @@ typedef u_int32 u_fp;
                        q_tmp = ~(u_int64)ldexp(-d_tmp, 32) + 1; \
                else \
                        q_tmp = (u_int64)ldexp(d_tmp, 32); \
-               (r_uf) = (u_int32)(q_tmp & UINT32_MAX); \
+               (r_uf) = (u_int32)(q_tmp & U_INT32_MAX); \
                (r_ui) = (u_int32)(q_tmp >> 32); \
        } while(0)
 

diff --git a/include/ntp_types.h b/include/ntp_types.h
index 4c5e3f42aac0a4b12db843c7d22d07a70673eea5..363dd7d306b607e4d24043b5fcb96e4098956b63 100644 (file)
--- a/include/ntp_types.h
+++ b/include/ntp_types.h
@@ -63,22 +63,22 @@ typedef unsigned int u_int;
 #ifdef HAVE_UINT32_T
 # ifndef HAVE_INT32
    typedef     int32_t         int32;
-#  ifndef INT32_MIN
-#   define INT32_MIN INT32_T_MIN
-#  endif
-#  ifndef INT32_MAX
-#   define INT32_MAX INT32_T_MAX
-#  endif
 # endif
 # ifndef HAVE_U_INT32
    typedef     uint32_t        u_int32;
-#  define U_INT32_MAX UINT32_T_MAX
+#  ifndef U_INT32_MAX
+#   define U_INT32_MAX UINT32_MAX
+#  endif
 # endif
 #elif (SIZEOF_INT == 4)
 # if !defined(HAVE_INT32) && !defined(int32)
    typedef     int             int32;
-#  define INT32_MIN INT_MIN
-#  define INT32_MAX INT_MAX
+#  ifndef INT32_MIN
+#   define INT32_MIN INT_MIN
+#  endif
+#  ifndef INT32_MAX
+#   define INT32_MAX INT_MAX
+#  endif
 # endif
 # if !defined(HAVE_U_INT32) && !defined(u_int32)
    typedef     unsigned        u_int32;
@@ -108,8 +108,8 @@ typedef unsigned int u_int;
 # endif
 #endif /* !HAVE_UINT32_T && SIZEOF_INT != 4 */
 
-#ifndef UINT32_MAX
-#define UINT32_MAX     0xffffffff
+#ifndef U_INT32_MAX
+#define U_INT32_MAX    0xffffffff
 #endif