[Emacs-diffs] /srv/bzr/emacs/trunk r103157: Merge: gnulib: allow multiple gnulib generated replacements to coexist

[Paul Eggert]

------------------------------------------------------------
revno: 103157 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 17:03:27 -0800
message:
  Merge: gnulib: allow multiple gnulib generated replacements to coexist
modified:
  ChangeLog
  lib/getopt.in.h
  lib/time.in.h
  lib/unistd.in.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-02-06 22:13:03 +0000
+++ b/ChangeLog 2011-02-07 01:01:26 +0000
@@ -1,5 +1,10 @@
 2011-02-06  Paul Eggert  <address@hidden>
 
+       gnulib: allow multiple gnulib generated replacements to coexist
+       This defines a few preprocessor symbols that should not affect Emacs.
+       * lib/getopt.in.h, lib/time.in.h, lib/unistd.in.h: Regenerate
+       via "make sync-from-gnulib".
+
        gnulib: undo previous change
        The upstream _HEADERS change was backed out of gnulib (see the
        same thread).  Stay in sync with gnulib.

=== modified file 'lib/getopt.in.h'
--- a/lib/getopt.in.h   2011-02-06 22:13:03 +0000
+++ b/lib/getopt.in.h   2011-02-07 01:01:26 +0000
@@ -181,6 +181,7 @@
    one).  For long options that have a zero `flag' field, `getopt'
    returns the contents of the `val' field.  */
 
+# if !GNULIB_defined_struct_option
 struct option
 {
   const char *name;
@@ -190,6 +191,8 @@
   int *flag;
   int val;
 };
+#  define GNULIB_defined_struct_option 1
+# endif
 
 /* Names for the values of the `has_arg' field of `struct option'.  */
 

=== modified file 'lib/time.in.h'
--- a/lib/time.in.h     2011-02-06 22:13:03 +0000
+++ b/lib/time.in.h     2011-02-07 01:01:26 +0000
@@ -69,13 +69,16 @@
 extern "C" {
 #   endif
 
-#   undef timespec
-#   define timespec rpl_timespec
+#   if !GNULIB_defined_struct_timespec
+#    undef timespec
+#    define timespec rpl_timespec
 struct timespec
 {
   time_t tv_sec;
   long int tv_nsec;
 };
+#    define GNULIB_defined_struct_timespec 1
+#   endif
 
 #   ifdef __cplusplus
 }
@@ -84,6 +87,7 @@
 #  endif
 # endif
 
+# if !GNULIB_defined_struct_time_t_must_be_integral
 /* Per http://austingroupbugs.net/view.php?id=327, POSIX requires
    time_t to be an integer type, even though C99 permits floating
    point.  We don't know of any implementation that uses floating
@@ -92,6 +96,8 @@
 struct __time_t_must_be_integral {
   unsigned int __floating_time_t_unsupported : (time_t) 1;
 };
+#  define GNULIB_defined_struct_time_t_must_be_integral 1
+# endif
 
 /* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
    return -1 and store the remaining time into RMTP.  See

=== modified file 'lib/unistd.in.h'
--- a/lib/unistd.in.h   2011-02-06 22:13:03 +0000
+++ b/lib/unistd.in.h   2011-02-07 01:01:26 +0000
@@ -796,11 +796,14 @@
 #    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #     define getpagesize() _gl_getpagesize ()
 #    else
+#     if !GNULIB_defined_getpagesize_function
 static inline int
 getpagesize ()
 {
   return _gl_getpagesize ();
 }
+#      define GNULIB_defined_getpagesize_function 1
+#     endif
 #    endif
 #   endif
 #  endif