cvs-cvs
[Top][All Lists]
Advanced

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

[Cvs-cvs] ccvs libChangeLog libMakefile.am libMakefile.gn...


From: Mark D. Baushke
Subject: [Cvs-cvs] ccvs libChangeLog libMakefile.am libMakefile.gn...
Date: Sat, 24 Jun 2006 09:30:03 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   06/06/24 09:30:03

Modified files:
        lib            : ChangeLog Makefile.am Makefile.gnulib 
                         Makefile.in stdint_.h 
        m4             : ChangeLog stdint.m4 
        windows-NT     : ChangeLog stdint.h 

Log message:
        * lib/Makefile.gnulib, lib/stdint_.h: Update from gnulib.
        * lib/Makefile.am: Update from Makefile.gnulib
        * lib/Makefile.in: Regenerated.
        
        * m4/stdint.m4: Update from gnulib.
        
        * windows-NT/stdint.h: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.518&r2=1.519
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.am?cvsroot=cvs&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.gnulib?cvsroot=cvs&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.in?cvsroot=cvs&r1=1.210&r2=1.211
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/stdint_.h?cvsroot=cvs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/ChangeLog?cvsroot=cvs&r1=1.173&r2=1.174
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/stdint.m4?cvsroot=cvs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/ChangeLog?cvsroot=cvs&r1=1.365&r2=1.366
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/stdint.h?cvsroot=cvs&r1=1.13&r2=1.14

Patches:
Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -b -r1.518 -r1.519
--- lib/ChangeLog       23 Jun 2006 16:22:28 -0000      1.518
+++ lib/ChangeLog       24 Jun 2006 09:30:01 -0000      1.519
@@ -1,3 +1,9 @@
+2006-06-24  Mark D. Baushke  <address@hidden>
+
+       * Makefile.gnulib, stdint_.h: Update from gnulib.
+       * Makefile.am: Update from Makefile.gnulib
+       * Makefile.in: Regenerated.
+
 2006-06-23  Larry Jones  <address@hidden>
 
        * stdint_.h: Try harder to find a definition of WCHAR_MIN/MAX.

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.am,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- lib/Makefile.am     19 Jun 2006 17:45:58 -0000      1.111
+++ lib/Makefile.am     24 Jun 2006 09:30:02 -0000      1.112
@@ -38,6 +38,7 @@
 ## Zero some variables so Automake will allow us to use += on them.
 BUILT_SOURCES =
 MOSTLYCLEANFILES =
+MOSTLYCLEANDIRS =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 
@@ -400,9 +401,7 @@
        cp $(srcdir)/socket_.h address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
-
-mostlyclean-local:
-       -rmdir sys 2>/dev/null
+MOSTLYCLEANDIRS += sys
 
 ## end   gnulib module sys_socket
 
@@ -454,6 +453,15 @@
 
 ## end   gnulib module xsize
 
+
+mostlyclean-local:
+       @test -z "$(MOSTLYCLEANDIRS)" || \
+         for dir in $(MOSTLYCLEANDIRS); do \
+           if test -d $$dir; then \
+             echo "rmdir $$dir"; rmdir $$dir; \
+           fi; \
+         done
+
 # Until Automake gets its act together
 distclean-local:
        rm -f fnmatch.h

Index: lib/Makefile.gnulib
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.gnulib,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- lib/Makefile.gnulib 19 Jun 2006 17:45:58 -0000      1.74
+++ lib/Makefile.gnulib 24 Jun 2006 09:30:02 -0000      1.75
@@ -21,6 +21,7 @@
 BUILT_SOURCES =
 SUFFIXES =
 MOSTLYCLEANFILES =
+MOSTLYCLEANDIRS =
 CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
@@ -342,9 +343,7 @@
        cp $(srcdir)/socket_.h address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
-
-mostlyclean-local:
-       -rmdir sys 2>/dev/null
+MOSTLYCLEANDIRS += sys
 
 ## end   gnulib module sys_socket
 
@@ -397,4 +396,12 @@
 ## end   gnulib module xsize
 
 
+mostlyclean-local:
+       @test -z "$(MOSTLYCLEANDIRS)" || \
+         for dir in $(MOSTLYCLEANDIRS); do \
+           if test -d $$dir; then \
+             echo "rmdir $$dir"; rmdir $$dir; \
+           fi; \
+         done
+
 # Makefile.am ends here

Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.in,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- lib/Makefile.in     19 Jun 2006 17:45:58 -0000      1.210
+++ lib/Makefile.in     24 Jun 2006 09:30:02 -0000      1.211
@@ -438,6 +438,7 @@
        getdate-expected getdate-got getdate.diff getopt.h getopt.h-t \
        glob.h glob.h-t stdbool.h stdbool.h-t stdint.h stdint.h-t \
        sys/socket.h sys/socket.h-t unistd.h
+MOSTLYCLEANDIRS = sys
 DISTCLEANFILES = getdate.log
 MAINTAINERCLEANFILES = getdate.c
 
@@ -1058,14 +1059,19 @@
        cp $(srcdir)/socket_.h address@hidden
        mv address@hidden $@
 
-mostlyclean-local:
-       -rmdir sys 2>/dev/null
-
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
 unistd.h:
        echo '/* Empty placeholder for address@hidden  */' >$@
 
+mostlyclean-local:
+       @test -z "$(MOSTLYCLEANDIRS)" || \
+         for dir in $(MOSTLYCLEANDIRS); do \
+           if test -d $$dir; then \
+             echo "rmdir $$dir"; rmdir $$dir; \
+           fi; \
+         done
+
 # Until Automake gets its act together
 distclean-local:
        rm -f fnmatch.h

Index: lib/stdint_.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/stdint_.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- lib/stdint_.h       23 Jun 2006 16:22:29 -0000      1.13
+++ lib/stdint_.h       24 Jun 2006 09:30:02 -0000      1.14
@@ -42,7 +42,8 @@
      <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. */
+  /* IRIX 6.5 has <inttypes.h>, and <sys/types.h> defines some of these
+     types as well.  */
 # include <sys/types.h>
 # if @HAVE_INTTYPES_H@
 #  include @FULL_PATH_INTTYPES_H@
@@ -931,21 +932,46 @@
 #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
 
 /* 7.18.4.1. Macros for minimum-width integer constants */
+/* According to ISO C 99 Technical Corrigendum 1 */
 
 #undef INT8_C
 #undef UINT8_C
 #define INT8_C(x) x
-#define UINT8_C(x) x##U
+#if @HAVE_UINT8_T@
+# if @BITSIZEOF_UINT8_T@ < @BITSIZEOF_UNSIGNED_INT@
+#  define UINT8_C(x) x
+# else
+#  define UINT8_C(x) x##U
+# endif
+#else
+# define UINT8_C(x) x
+#endif
 
 #undef INT16_C
 #undef UINT16_C
 #define INT16_C(x) x
-#define UINT16_C(x) x##U
+#if @HAVE_UINT16_T@
+# if @BITSIZEOF_UINT16_T@ < @BITSIZEOF_UNSIGNED_INT@
+#  define UINT16_C(x) x
+# else
+#  define UINT16_C(x) x##U
+# endif
+#else
+# define UINT16_C(x) x
+#endif
 
 #undef INT32_C
 #undef UINT32_C
 #define INT32_C(x) x
-#define UINT32_C(x) x##U
+#if @HAVE_UINT32_T@
+# if @BITSIZEOF_UINT32_T@ < @BITSIZEOF_UNSIGNED_INT@
+#  define UINT32_C(x) x
+# else
+#  define UINT32_C(x) x##U
+# endif
+#else
+# define UINT32_C(x) x
+#endif
 
 #undef INT64_C
 #undef UINT64_C

Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -b -r1.173 -r1.174
--- m4/ChangeLog        23 Jun 2006 16:22:06 -0000      1.173
+++ m4/ChangeLog        24 Jun 2006 09:30:03 -0000      1.174
@@ -1,3 +1,7 @@
+2006-06-24  Mark D. Baushke  <address@hidden>
+
+       * stdint.m4: Update from gnulib.
+
 2006-06-23  Larry Jones  <address@hidden>
 
        * stdint.m4: Combine BSD/OS stuff with OpenBSD/SGI and use the

Index: m4/stdint.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/stdint.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- m4/stdint.m4        23 Jun 2006 16:22:06 -0000      1.8
+++ m4/stdint.m4        24 Jun 2006 09:30:03 -0000      1.9
@@ -1,4 +1,4 @@
-# stdint.m4 serial 7
+# stdint.m4 serial 8
 dnl Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,

Index: windows-NT/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/ChangeLog,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -b -r1.365 -r1.366
--- windows-NT/ChangeLog        23 Jun 2006 16:22:46 -0000      1.365
+++ windows-NT/ChangeLog        24 Jun 2006 09:30:03 -0000      1.366
@@ -1,3 +1,7 @@
+2006-06-24  Mark D. Baushke  <address@hidden>
+
+       * stdint.h: Regenerated.
+
 2006-06-23  Larry Jones  <address@hidden>
 
        * stdint.h: Regenerated.

Index: windows-NT/stdint.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/stdint.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- windows-NT/stdint.h 23 Jun 2006 16:22:46 -0000      1.13
+++ windows-NT/stdint.h 24 Jun 2006 09:30:03 -0000      1.14
@@ -49,7 +49,8 @@
      <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. */
+  /* IRIX 6.5 has <inttypes.h>, and <sys/types.h> defines some of these
+     types as well.  */
 # include <sys/types.h>
 # if 0
 #  include 
@@ -938,21 +939,46 @@
 #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
 
 /* 7.18.4.1. Macros for minimum-width integer constants */
+/* According to ISO C 99 Technical Corrigendum 1 */
 
 #undef INT8_C
 #undef UINT8_C
 #define INT8_C(x) x
-#define UINT8_C(x) x##U
+#if 0
+# if 8 < 32
+#  define UINT8_C(x) x
+# else
+#  define UINT8_C(x) x##U
+# endif
+#else
+# define UINT8_C(x) x
+#endif
 
 #undef INT16_C
 #undef UINT16_C
 #define INT16_C(x) x
-#define UINT16_C(x) x##U
+#if 0
+# if 16 < 32
+#  define UINT16_C(x) x
+# else
+#  define UINT16_C(x) x##U
+# endif
+#else
+# define UINT16_C(x) x
+#endif
 
 #undef INT32_C
 #undef UINT32_C
 #define INT32_C(x) x
-#define UINT32_C(x) x##U
+#if 0
+# if 32 < 32
+#  define UINT32_C(x) x
+# else
+#  define UINT32_C(x) x##U
+# endif
+#else
+# define UINT32_C(x) x
+#endif
 
 #undef INT64_C
 #undef UINT64_C




reply via email to

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