- Compilation on older Solaris systems (lacking /usr/include/sys/int_types.h)

  has been repaired. [ISC-Bugs #15339]

diff --git a/RELNOTES b/RELNOTES
index 8a6433561b705c4312d2252c44ad8abc4b0bb4f8..9321dbf2be72e2b261805ea8c1c6c719065972bb 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -126,6 +126,9 @@ and for prodding me into improving it.
   event to turn these into FREE leases without peer acknowledgement
   (after STOS+MCLT) has been repaired.
 
+- Compilation on older Solaris systems (lacking /usr/include/sys/int_types.h)
+  has been repaired.
+
                        Changes since 3.0.3b3
 
 - dhclient.conf documentation for interface {} was updated to reflect recent

diff --git a/includes/cf/sunos5-5.h b/includes/cf/sunos5-5.h
index 8a1e416bc18bb261146e12beb7fed00e7e36ce6c..e9789d60a686c162db4f82e46fe008539b5dd11e 100644 (file)
--- a/includes/cf/sunos5-5.h
+++ b/includes/cf/sunos5-5.h
@@ -3,7 +3,7 @@
    System dependencies for Solaris 2.x (tested on 2.5 with gcc)... */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -34,9 +34,18 @@
 
 /* SunOS defines uint*_t and int*_t, but not u_int*_t.  */
 
+#if defined(_SYS_INT_TYPES_H)
 typedef uint8_t                u_int8_t;
 typedef uint16_t       u_int16_t;
 typedef uint32_t       u_int32_t;
+#else /* Older SunOS has no idea what these things mean. */
+typedef int8_t char
+typedef int16_t short
+typedef int32_t int    /* If _LP64, long is 64-bit, int is still 32. */
+typedef u_int8_t unsigned char
+typedef u_int16_t unsigned short
+typedef u_int32_t unsigned int
+#endif /* defined(_SYS_INT_TYPES_H) */
 
 /* The jmp_buf type is an array on Solaris, so we can't dereference it
    and must declare it differently. */