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

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   06/06/23 16:22:29

Modified files:
        lib            : ChangeLog stdint_.h 

Log message:
        * stdint_.h: Try harder to find a definition of WCHAR_MIN/MAX.
        Combine BSD/OS stuff with OpenBSD/SGI and use the correct
        preprocessor symbol.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.517&r2=1.518
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/stdint_.h?cvsroot=cvs&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -b -r1.517 -r1.518
--- ChangeLog   23 Jun 2006 14:28:20 -0000      1.517
+++ ChangeLog   23 Jun 2006 16:22:28 -0000      1.518
@@ -1,3 +1,9 @@
+2006-06-23  Larry Jones  <address@hidden>
+
+       * stdint_.h: Try harder to find a definition of WCHAR_MIN/MAX.
+       Combine BSD/OS stuff with OpenBSD/SGI and use the correct
+       preprocessor symbol.
+
 2006-06-23  Mark D. Baushke  <address@hidden>
 
        * glob.c (collated_compare): Update from gnulib.

Index: stdint_.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/stdint_.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- stdint_.h   23 Jun 2006 14:28:20 -0000      1.12
+++ stdint_.h   23 Jun 2006 16:22:29 -0000      1.13
@@ -26,6 +26,9 @@
 
 /* Get wchar_t, WCHAR_MIN, WCHAR_MAX.  */
 #include <stddef.h>
+#if !defined(WCHAR_MIN) && defined(HAVE_WCHAR_H)
+# include <wchar.h>
+#endif
 /* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
 #include <limits.h>
 
@@ -33,16 +36,12 @@
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__bsdos__)
-  /* In BSD/OS 4.2, <sys/types.h> includes some of the needed typedefs
-     that would otherwise conflict with types in a generated <stdint.h>. */
-# include <sys/types.h>
-#endif
-#if defined(__OpenBSD__) || defined(__sgi)
+#if defined(__OpenBSD__) || defined(__bsdi__) || defined(__sgi)
   /* In OpenBSD 3.8, <sys/types.h> includes <machine/types.h>, which defines
      int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
      <inttypes.h> includes <machine/types.h> and also defines intptr_t and
      uintptr_t.  */
+  /* BSD/OS 4.2 is similar, but doesn't have <inttypes.h> */
   /* SGI-cc IRIX 5.3 needs some of the <sys/types.h> types too. */
 # include <sys/types.h>
 # if @HAVE_INTTYPES_H@