cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] ccvs ChangeLog configure lib/ChangeLog lib/base...


From: Mark D. Baushke
Subject: [Cvs-cvs] ccvs ChangeLog configure lib/ChangeLog lib/base...
Date: Fri, 23 Jun 2006 14:28:21 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   06/06/23 14:28:21

Modified files:
        .              : ChangeLog configure 
        lib            : ChangeLog base64.c glob.c stdint_.h 
        m4             : ChangeLog stdint.m4 
        windows-NT     : ChangeLog stdint.h 

Log message:
        * configure: Regenerated.
        
        * lib/glob.c (collated_compare): Update from gnulib.
        * lib/stdint_.h: Both BSD/OS 4.2 and SGI-cc IRIX 5.3 seem to also need
        <sys/types.h> included.
        * lib/base64.c (B64): Fork from gnulib for IBM C V6 AIX. For reasons
        unclear, traditional CPP rather than C89 semantics are used in
        macro substitution inside of a string.
        
        * m4/stdint.m4: Both BSD/OS 4.2 and SGI-cc IRIX 5.3 seem to also need
        <sys/types.h> included.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1316&r2=1.1317
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure?cvsroot=cvs&r1=1.455&r2=1.456
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.516&r2=1.517
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/base64.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/glob.c?cvsroot=cvs&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/stdint_.h?cvsroot=cvs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/ChangeLog?cvsroot=cvs&r1=1.171&r2=1.172
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/stdint.m4?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/ChangeLog?cvsroot=cvs&r1=1.363&r2=1.364
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/stdint.h?cvsroot=cvs&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1316
retrieving revision 1.1317
diff -u -b -r1.1316 -r1.1317
--- ChangeLog   22 Jun 2006 19:04:35 -0000      1.1316
+++ ChangeLog   23 Jun 2006 14:28:20 -0000      1.1317
@@ -1,3 +1,7 @@
+2006-06-23  Mark D. Baushke  <address@hidden>
+
+       * configure: Regenerated.
+
 2006-06-22  Mark D. Baushke  <address@hidden>
 
        * config.h.in: Update from gnulib.

Index: configure
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -b -r1.455 -r1.456
--- configure   22 Jun 2006 19:04:35 -0000      1.455
+++ configure   23 Jun 2006 14:28:20 -0000      1.456
@@ -28617,7 +28617,10 @@
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__OpenBSD__)
+#if defined(__bsdos__)
+# include <sys/types.h>
+#endif
+#if defined(__OpenBSD__) || defined(__sgi)
 # include <sys/types.h>
 # if HAVE_INTTYPES_H
 #  include FULL_PATH_INTTYPES_H
@@ -28629,7 +28632,7 @@
 #if defined(__sun) && HAVE_SYS_INTTYPES_H
 # include <sys/inttypes.h>
 #endif
-#if (defined(__hpux) || defined(_AIX) || defined(__sgi)) && HAVE_INTTYPES_H
+#if (defined(__hpux) || defined(_AIX)) && HAVE_INTTYPES_H
 # include FULL_PATH_INTTYPES_H
 #endif
 #if HAVE_STDINT_H

Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -b -r1.516 -r1.517
--- lib/ChangeLog       22 Jun 2006 19:04:35 -0000      1.516
+++ lib/ChangeLog       23 Jun 2006 14:28:20 -0000      1.517
@@ -1,3 +1,12 @@
+2006-06-23  Mark D. Baushke  <address@hidden>
+
+       * glob.c (collated_compare): Update from gnulib.
+       * stdint_.h: Both BSD/OS 4.2 and SGI-cc IRIX 5.3 seem to also need
+       <sys/types.h> included.
+       * base64.c (B64): Fork from gnulib for IBM C V6 AIX. For reasons
+       unclear, traditional CPP rather than C89 semantics are used in
+       macro substitution inside of a string.
+
 2006-06-22  Mark D. Baushke  <address@hidden>
 
        * glob.c (collated_compare): Fork from gnulib. Patch from Larry Jones.

Index: lib/base64.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/base64.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/base64.c        25 Apr 2006 14:48:46 -0000      1.3
+++ lib/base64.c        23 Jun 2006 14:28:20 -0000      1.4
@@ -150,71 +150,71 @@
    1003.1-2001 require that char and unsigned char are 8-bit
    quantities, though, taking care of that problem.  But this may be a
    potential problem on non-POSIX C99 platforms.  */
-#define B64(x)                                 \
-  ((x) == 'A' ? 0                              \
-   : (x) == 'B' ? 1                            \
-   : (x) == 'C' ? 2                            \
-   : (x) == 'D' ? 3                            \
-   : (x) == 'E' ? 4                            \
-   : (x) == 'F' ? 5                            \
-   : (x) == 'G' ? 6                            \
-   : (x) == 'H' ? 7                            \
-   : (x) == 'I' ? 8                            \
-   : (x) == 'J' ? 9                            \
-   : (x) == 'K' ? 10                           \
-   : (x) == 'L' ? 11                           \
-   : (x) == 'M' ? 12                           \
-   : (x) == 'N' ? 13                           \
-   : (x) == 'O' ? 14                           \
-   : (x) == 'P' ? 15                           \
-   : (x) == 'Q' ? 16                           \
-   : (x) == 'R' ? 17                           \
-   : (x) == 'S' ? 18                           \
-   : (x) == 'T' ? 19                           \
-   : (x) == 'U' ? 20                           \
-   : (x) == 'V' ? 21                           \
-   : (x) == 'W' ? 22                           \
-   : (x) == 'X' ? 23                           \
-   : (x) == 'Y' ? 24                           \
-   : (x) == 'Z' ? 25                           \
-   : (x) == 'a' ? 26                           \
-   : (x) == 'b' ? 27                           \
-   : (x) == 'c' ? 28                           \
-   : (x) == 'd' ? 29                           \
-   : (x) == 'e' ? 30                           \
-   : (x) == 'f' ? 31                           \
-   : (x) == 'g' ? 32                           \
-   : (x) == 'h' ? 33                           \
-   : (x) == 'i' ? 34                           \
-   : (x) == 'j' ? 35                           \
-   : (x) == 'k' ? 36                           \
-   : (x) == 'l' ? 37                           \
-   : (x) == 'm' ? 38                           \
-   : (x) == 'n' ? 39                           \
-   : (x) == 'o' ? 40                           \
-   : (x) == 'p' ? 41                           \
-   : (x) == 'q' ? 42                           \
-   : (x) == 'r' ? 43                           \
-   : (x) == 's' ? 44                           \
-   : (x) == 't' ? 45                           \
-   : (x) == 'u' ? 46                           \
-   : (x) == 'v' ? 47                           \
-   : (x) == 'w' ? 48                           \
-   : (x) == 'x' ? 49                           \
-   : (x) == 'y' ? 50                           \
-   : (x) == 'z' ? 51                           \
-   : (x) == '0' ? 52                           \
-   : (x) == '1' ? 53                           \
-   : (x) == '2' ? 54                           \
-   : (x) == '3' ? 55                           \
-   : (x) == '4' ? 56                           \
-   : (x) == '5' ? 57                           \
-   : (x) == '6' ? 58                           \
-   : (x) == '7' ? 59                           \
-   : (x) == '8' ? 60                           \
-   : (x) == '9' ? 61                           \
-   : (x) == '+' ? 62                           \
-   : (x) == '/' ? 63                           \
+#define B64(xx)                                        \
+  ((xx) == 'A' ? 0                             \
+   : (xx) == 'B' ? 1                           \
+   : (xx) == 'C' ? 2                           \
+   : (xx) == 'D' ? 3                           \
+   : (xx) == 'E' ? 4                           \
+   : (xx) == 'F' ? 5                           \
+   : (xx) == 'G' ? 6                           \
+   : (xx) == 'H' ? 7                           \
+   : (xx) == 'I' ? 8                           \
+   : (xx) == 'J' ? 9                           \
+   : (xx) == 'K' ? 10                          \
+   : (xx) == 'L' ? 11                          \
+   : (xx) == 'M' ? 12                          \
+   : (xx) == 'N' ? 13                          \
+   : (xx) == 'O' ? 14                          \
+   : (xx) == 'P' ? 15                          \
+   : (xx) == 'Q' ? 16                          \
+   : (xx) == 'R' ? 17                          \
+   : (xx) == 'S' ? 18                          \
+   : (xx) == 'T' ? 19                          \
+   : (xx) == 'U' ? 20                          \
+   : (xx) == 'V' ? 21                          \
+   : (xx) == 'W' ? 22                          \
+   : (xx) == 'X' ? 23                          \
+   : (xx) == 'Y' ? 24                          \
+   : (xx) == 'Z' ? 25                          \
+   : (xx) == 'a' ? 26                          \
+   : (xx) == 'b' ? 27                          \
+   : (xx) == 'c' ? 28                          \
+   : (xx) == 'd' ? 29                          \
+   : (xx) == 'e' ? 30                          \
+   : (xx) == 'f' ? 31                          \
+   : (xx) == 'g' ? 32                          \
+   : (xx) == 'h' ? 33                          \
+   : (xx) == 'i' ? 34                          \
+   : (xx) == 'j' ? 35                          \
+   : (xx) == 'k' ? 36                          \
+   : (xx) == 'l' ? 37                          \
+   : (xx) == 'm' ? 38                          \
+   : (xx) == 'n' ? 39                          \
+   : (xx) == 'o' ? 40                          \
+   : (xx) == 'p' ? 41                          \
+   : (xx) == 'q' ? 42                          \
+   : (xx) == 'r' ? 43                          \
+   : (xx) == 's' ? 44                          \
+   : (xx) == 't' ? 45                          \
+   : (xx) == 'u' ? 46                          \
+   : (xx) == 'v' ? 47                          \
+   : (xx) == 'w' ? 48                          \
+   : (xx) == 'x' ? 49                          \
+   : (xx) == 'y' ? 50                          \
+   : (xx) == 'z' ? 51                          \
+   : (xx) == '0' ? 52                          \
+   : (xx) == '1' ? 53                          \
+   : (xx) == '2' ? 54                          \
+   : (xx) == '3' ? 55                          \
+   : (xx) == '4' ? 56                          \
+   : (xx) == '5' ? 57                          \
+   : (xx) == '6' ? 58                          \
+   : (xx) == '7' ? 59                          \
+   : (xx) == '8' ? 60                          \
+   : (xx) == '9' ? 61                          \
+   : (xx) == '+' ? 62                          \
+   : (xx) == '/' ? 63                          \
    : -1)
 
 static const signed char b64[0x100] = {

Index: lib/glob.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/glob.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- lib/glob.c  22 Jun 2006 19:04:35 -0000      1.19
+++ lib/glob.c  23 Jun 2006 14:28:20 -0000      1.20
@@ -909,8 +909,8 @@
 static int
 collated_compare (const void *a, const void *b)
 {
-  const char *const s1 = *(const char *const *) a;
-  const char *const s2 = *(const char *const *) b;
+  char *const *ps1 = a; char *s1 = *ps1;
+  char *const *ps2 = b; char *s2 = *ps2;
 
   if (s1 == s2)
     return 0;

Index: lib/stdint_.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/stdint_.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- lib/stdint_.h       22 Jun 2006 19:04:35 -0000      1.11
+++ lib/stdint_.h       23 Jun 2006 14:28:20 -0000      1.12
@@ -33,11 +33,17 @@
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__OpenBSD__)
+#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)
   /* 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.  */
+  /* SGI-cc IRIX 5.3 needs some of the <sys/types.h> types too. */
 # include <sys/types.h>
 # if @HAVE_INTTYPES_H@
 #  include @FULL_PATH_INTTYPES_H@
@@ -55,7 +61,7 @@
      But note that <sys/int_types.h> contains only the type definitions!  */
 # include <sys/inttypes.h>
 #endif
-#if (defined(__hpux) || defined(_AIX) || defined(__sgi)) && @HAVE_INTTYPES_H@
+#if (defined(__hpux) || defined(_AIX)) && @HAVE_INTTYPES_H@
   /* HP-UX 10 <inttypes.h> has nearly everything, except UINT_LEAST8_MAX,
      UINT_FAST8_MAX, PTRDIFF_MIN, PTRDIFF_MAX.  */
   /* AIX 4 <inttypes.h> has nearly everything, except INTPTR_MIN, INTPTR_MAX,

Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/ChangeLog,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -b -r1.171 -r1.172
--- m4/ChangeLog        22 Jun 2006 19:04:35 -0000      1.171
+++ m4/ChangeLog        23 Jun 2006 14:28:20 -0000      1.172
@@ -1,3 +1,8 @@
+2006-06-23  Mark D. Baushke  <address@hidden>
+
+       * stdint.m4: Both BSD/OS 4.2 and SGI-cc IRIX 5.3 seem to also need
+       <sys/types.h> included.
+
 2006-06-22  Mark D. Baushke  <address@hidden>
 
        * stdint.m4: Fork from gnulib based on tests with SGI.

Index: m4/stdint.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/stdint.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- m4/stdint.m4        22 Jun 2006 19:04:35 -0000      1.6
+++ m4/stdint.m4        23 Jun 2006 14:28:20 -0000      1.7
@@ -90,7 +90,10 @@
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__OpenBSD__)
+#if defined(__bsdos__)
+# include <sys/types.h>
+#endif
+#if defined(__OpenBSD__) || defined(__sgi)
 # include <sys/types.h>
 # if HAVE_INTTYPES_H
 #  include FULL_PATH_INTTYPES_H
@@ -102,7 +105,7 @@
 #if defined(__sun) && HAVE_SYS_INTTYPES_H
 # include <sys/inttypes.h>
 #endif
-#if (defined(__hpux) || defined(_AIX) || defined(__sgi)) && HAVE_INTTYPES_H
+#if (defined(__hpux) || defined(_AIX)) && HAVE_INTTYPES_H
 # include FULL_PATH_INTTYPES_H
 #endif
 #if HAVE_STDINT_H

Index: windows-NT/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/ChangeLog,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -b -r1.363 -r1.364
--- windows-NT/ChangeLog        22 Jun 2006 19:04:36 -0000      1.363
+++ windows-NT/ChangeLog        23 Jun 2006 14:28:20 -0000      1.364
@@ -1,3 +1,7 @@
+2006-06-23  Mark D. Baushke  <address@hidden>
+
+       * stdint.h: Regenerated.
+
 2006-06-22  Mark D. Baushke  <address@hidden>
 
        * config.h.in.in (HAVE_GETHOSTBYNAME): Add #undef to match

Index: windows-NT/stdint.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/stdint.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- windows-NT/stdint.h 22 Jun 2006 19:04:36 -0000      1.11
+++ windows-NT/stdint.h 23 Jun 2006 14:28:20 -0000      1.12
@@ -40,11 +40,17 @@
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__OpenBSD__)
+#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)
   /* 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.  */
+  /* SGI-cc IRIX 5.3 needs some of the <sys/types.h> types too. */
 # include <sys/types.h>
 # if 0
 #  include 
@@ -62,7 +68,7 @@
      But note that <sys/int_types.h> contains only the type definitions!  */
 # include <sys/inttypes.h>
 #endif
-#if (defined(__hpux) || defined(_AIX) || defined(__sgi)) && 0
+#if (defined(__hpux) || defined(_AIX)) && 0
   /* HP-UX 10 <inttypes.h> has nearly everything, except UINT_LEAST8_MAX,
      UINT_FAST8_MAX, PTRDIFF_MIN, PTRDIFF_MAX.  */
   /* AIX 4 <inttypes.h> has nearly everything, except INTPTR_MIN, INTPTR_MAX,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]