[Emacs-diffs] trunk r116699: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 116699
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2014-03-07 10:57:11 -0800
message:
  Merge from gnulib.
  
  This incorporates:
  2014-03-04 stdint: fix missing SIZE_MAX on Android
  2013-03-02 sys_types: avoid autoconf warning about gl_SYS_TYPES_H
  * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
  * lib/stdint.in.h, lib/sys_types.in.h, m4/sys_types_h.m4:
  Update from gnulib.
  
  Fix oversight preventing lib/sys/types.h from being generated.
  * admin/merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/merge-gnulib             mergegnulib-20120521022411-ndnoaiok33j6dn0g-1
  lib/gnulib.mk                  gnulib.mk-20110108211121-3ig4un4ogtyyca3s-7
  lib/stdint.in.h                stdint.in.h-20110219072751-rh870ifgjrno4zfz-1
  lib/sys_types.in.h             
sys_types.in.h-20120526231328-c130r2vqzi9ra04n-2
  m4/gnulib-comp.m4              glcomp.m4-20110127072028-6mkjqxjzdsx0wp15-1
  m4/sys_types_h.m4              
sys_types_h.m4-20120526231328-c130r2vqzi9ra04n-5

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-05 19:57:36 +0000
+++ b/ChangeLog 2014-03-07 18:57:11 +0000
@@ -1,3 +1,12 @@
+2014-03-07  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2014-03-04 stdint: fix missing SIZE_MAX on Android
+       2013-03-02 sys_types: avoid autoconf warning about gl_SYS_TYPES_H
+       * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+       * lib/stdint.in.h, lib/sys_types.in.h, m4/sys_types_h.m4:
+       Update from gnulib.
+
 2014-03-05  Glenn Morris  <address@hidden>
 
        * configure.ac: Tweak the "unported" error message.

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-03-03 04:57:26 +0000
+++ b/admin/ChangeLog   2014-03-07 18:57:11 +0000
@@ -1,3 +1,8 @@
+2014-03-07  Paul Eggert  <address@hidden>
+
+       Fix oversight preventing lib/sys/types.h from being generated.
+       * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types.
+
 2014-02-06  David Engster  <address@hidden>
 
        * grammars/c.by (function-pointer): Correctly deal with anonymous

=== modified file 'admin/merge-gnulib'
--- a/admin/merge-gnulib        2014-01-01 07:43:34 +0000
+++ b/admin/merge-gnulib        2014-03-07 18:57:11 +0000
@@ -48,7 +48,7 @@
   --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
   --avoid=open --avoid=openat-die --avoid=opendir
   --avoid=raise
-  --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types
+  --avoid=save-cwd --avoid=select --avoid=sigprocmask
   --avoid=threadlib
   --conditional-dependencies --import --no-changelog --no-vc-files
   --makefile-name=gnulib.mk

=== modified file 'lib/gnulib.mk'
--- a/lib/gnulib.mk     2014-01-01 07:43:34 +0000
+++ b/lib/gnulib.mk     2014-03-07 18:57:11 +0000
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib 
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux 
--avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix 
--avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die 
--avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select 
--avoid=sigprocmask --avoid=sys_types --avoid=threadlib 
--makefile-name=gnulib.mk --conditional-dependencies --no-libtool 
--macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase 
careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 
crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ 
execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync 
getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat 
manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl 
readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio 
strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time 
timespec-add timespec-sub unsetenv update-copyright utimens warnings
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib 
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux 
--avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix 
--avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die 
--avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select 
--avoid=sigprocmask --avoid=threadlib --makefile-name=gnulib.mk 
--conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files 
alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits 
count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr 
dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir 
filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops 
largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect 
pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time 
stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat 
sys_time time timer-time timespec-add timespec-sub unsetenv update-copyright 
utimens warnings
 
 
 MOSTLYCLEANFILES += core *.stackdump
@@ -1549,6 +1549,31 @@
 
 ## end   gnulib module sys_time
 
+## begin gnulib module sys_types
+
+BUILT_SOURCES += sys/types.h
+
+# We need the following in order to create <sys/types.h> when the system
+# doesn't have one that works with the given compiler.
+sys/types.h: sys_types.in.h $(top_builddir)/config.status
+       $(AM_V_at)$(MKDIR_P) sys
+       $(AM_V_GEN)rm -f address@hidden $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
+             -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+             < $(srcdir)/sys_types.in.h; \
+       } > address@hidden && \
+       mv address@hidden $@
+MOSTLYCLEANFILES += sys/types.h sys/types.h-t
+
+EXTRA_DIST += sys_types.in.h
+
+## end   gnulib module sys_types
+
 ## begin gnulib module tempname
 
 if gl_GNULIB_ENABLED_tempname

=== modified file 'lib/stdint.in.h'
--- a/lib/stdint.in.h   2014-01-01 07:43:34 +0000
+++ b/lib/stdint.in.h   2014-03-07 18:57:11 +0000
@@ -38,8 +38,7 @@
    other system header files; just include the system's <stdint.h>.
    Ideally we should test __BIONIC__ here, but it is only defined after
    <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
-#if defined __ANDROID__ \
-    && defined _SYS_TYPES_H_ && !defined __need_size_t
+#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #else
 

=== modified file 'lib/sys_types.in.h'
--- a/lib/sys_types.in.h        2014-01-01 07:43:34 +0000
+++ b/lib/sys_types.in.h        2014-03-07 18:57:11 +0000
@@ -23,7 +23,9 @@
 #ifndef address@hidden@_SYS_TYPES_H
 
 /* The include_next requires a split double-inclusion guard.  */
+# define _GL_INCLUDING_SYS_TYPES_H
 address@hidden@ @NEXT_SYS_TYPES_H@
+# undef _GL_INCLUDING_SYS_TYPES_H
 
 #ifndef address@hidden@_SYS_TYPES_H
 #define address@hidden@_SYS_TYPES_H

=== modified file 'm4/gnulib-comp.m4'
--- a/m4/gnulib-comp.m4 2014-01-01 07:43:34 +0000
+++ b/m4/gnulib-comp.m4 2014-03-07 18:57:11 +0000
@@ -140,6 +140,7 @@
   # Code from module sys_select:
   # Code from module sys_stat:
   # Code from module sys_time:
+  # Code from module sys_types:
   # Code from module tempname:
   # Code from module time:
   # Code from module time_r:
@@ -372,6 +373,8 @@
   AC_PROG_MKDIR_P
   gl_HEADER_SYS_TIME_H
   AC_PROG_MKDIR_P
+  gl_SYS_TYPES_H
+  AC_PROG_MKDIR_P
   gl_HEADER_TIME_H
   gl_TIME_R
   if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then
@@ -907,6 +910,7 @@
   lib/sys_select.in.h
   lib/sys_stat.in.h
   lib/sys_time.in.h
+  lib/sys_types.in.h
   lib/tempname.c
   lib/tempname.h
   lib/time.in.h
@@ -1011,6 +1015,7 @@
   m4/sys_socket_h.m4
   m4/sys_stat_h.m4
   m4/sys_time_h.m4
+  m4/sys_types_h.m4
   m4/tempname.m4
   m4/time_h.m4
   m4/time_r.m4

=== modified file 'm4/sys_types_h.m4'
--- a/m4/sys_types_h.m4 2014-01-01 07:43:34 +0000
+++ b/m4/sys_types_h.m4 2014-03-07 18:57:11 +0000
@@ -1,10 +1,10 @@
-# sys_types_h.m4 serial 4
+# sys_types_h.m4 serial 5
 dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_SYS_TYPES_H],
+AC_DEFUN_ONCE([gl_SYS_TYPES_H],
 [
   AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
   gl_NEXT_HEADERS([sys/types.h])