[Cvs-cvs] ccvs/lib ChangeLog stdint_.h

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/03/27 06:08:36

Modified files:
        lib            : ChangeLog stdint_.h 

Log message:
        * stdint_.h: Protect against OpenBSD integer types from
        <sys/types.h>.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/ChangeLog.diff?tr1=1.492&tr2=1.493&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/stdint_.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: ccvs/lib/ChangeLog
diff -u ccvs/lib/ChangeLog:1.492 ccvs/lib/ChangeLog:1.493
--- ccvs/lib/ChangeLog:1.492    Mon Mar 20 02:21:56 2006
+++ ccvs/lib/ChangeLog  Mon Mar 27 06:08:36 2006
@@ -1,3 +1,8 @@
+2006-03-26  Mark D. Baushke  <address@hidden>
+
+       * stdint_.h: Protect against OpenBSD integer types from
+       <sys/types.h>.
+
 2006-03-19  Mark D. Baushke  <address@hidden>
 
        * closeout.c, fnmatch.c, fnmatch_loop.c, gai_strerror.c,
Index: ccvs/lib/stdint_.h
diff -u ccvs/lib/stdint_.h:1.5 ccvs/lib/stdint_.h:1.6
--- ccvs/lib/stdint_.h:1.5      Wed Jan 25 12:53:38 2006
+++ ccvs/lib/stdint_.h  Mon Mar 27 06:08:36 2006
@@ -33,6 +33,9 @@
 #if defined(__FreeBSD__)
 # include <sys/inttypes.h>
 #endif
+#if defined(__OpenBSD__)
+# include <sys/types.h>
+#endif
 #if defined(__linux__) && HAVE_SYS_BITYPES_H
   /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
      int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
@@ -62,7 +65,7 @@
 
 /* 7.18.1.1. Exact-width integer types */
 
-#if !defined(__FreeBSD__)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
 
 #ifdef _STDINT_H_NEED_SIGNED_INT_TYPES
 typedef signed char    int8_t;
@@ -97,7 +100,7 @@
 #define _STDINT_H_HAVE_INT64
 #endif
 
-#endif /* !FreeBSD */
+#endif /* !FreeBSD && !OpenBSD */
 
 /* 7.18.1.2. Minimum-width integer types */
 
@@ -127,14 +130,14 @@
 
 /* 7.18.1.4. Integer types capable of holding object pointers */
 
-#if !defined(__FreeBSD__)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
 
 /* On some platforms (like IRIX6 MIPS with -n32) sizeof(void*) < sizeof(long),
    but this doesn't matter here.  */
 typedef long          intptr_t;
 typedef unsigned long uintptr_t;
 
-#endif /* !FreeBSD */
+#endif /* !FreeBSD && !OpenBSD */
 
 /* 7.18.1.5. Greatest-width integer types */