Revert "updated gnulib"

This reverts commit 9ad95f3ac723ae85fdfbe4f3a4fab4ededfa7857.

diff --git a/gl/m4/intl.m4 b/gl/m4/intl.m4
index dffcd881b8ac60dcd0cb633f54d061cd8a40f09c..959bd0421ffc413d87d225e761578c3ba0042edb 100644 (file)
--- a/gl/m4/intl.m4
+++ b/gl/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 24 (gettext-0.18.3)
+# intl.m4 serial 23 (gettext-0.18.3)
 dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -61,7 +61,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
 
   dnl Use the _snprintf function only if it is declared (because on NetBSD it
   dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include <stdio.h>])
+  AC_CHECK_DECLS([_snprintf _snwprintf], , , [#include <stdio.h>])
 
   dnl Use the *_unlocked functions only if they are declared.
   dnl (because some of them were defined without being declared in Solaris
@@ -234,7 +234,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
   dnl (because some of them were defined without being declared in Solaris
   dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
   dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include <stdio.h>])
+  AC_CHECK_DECLS([feof_unlocked fgets_unlocked], , , [#include <stdio.h>])
 
   AM_ICONV
 

diff --git a/gl/m4/warnings.m4 b/gl/m4/warnings.m4
index 5f5da51606b2f905205512b57601a6e4c83a7216..184873283bbc51b4c4e7330a922926bcd71e8723 100644 (file)
--- a/gl/m4/warnings.m4
+++ b/gl/m4/warnings.m4
@@ -1,4 +1,4 @@
-# warnings.m4 serial 10
+# warnings.m4 serial 8
 dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -25,24 +25,15 @@ m4_ifdef([AS_VAR_APPEND],
 AC_DEFUN([gl_COMPILER_OPTION_IF],
 [AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl
 AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl
-AS_LITERAL_IF([$1],
-  [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))],
-  [gl_positive="$1"
-case $gl_positive in
-  -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
-esac
-m4_pushdef([gl_Positive], [$gl_positive])])dnl
 AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [
   gl_save_compiler_FLAGS="$gl_Flags"
-  gl_AS_VAR_APPEND(m4_defn([gl_Flags]),
-    [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["])
+  gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors $1"])
   AC_COMPILE_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
                     [AS_VAR_SET(gl_Warn, [yes])],
                     [AS_VAR_SET(gl_Warn, [no])])
   gl_Flags="$gl_save_compiler_FLAGS"
 ])
 AS_VAR_IF(gl_Warn, [yes], [$2], [$3])
-m4_popdef([gl_Positive])dnl
 AS_VAR_POPDEF([gl_Flags])dnl
 AS_VAR_POPDEF([gl_Warn])dnl
 ])

diff --git a/gl/sys_socket.in.h b/gl/sys_socket.in.h
index 8bbd5e489f479b6024acf212919e29a51ccfd62d..368afe43ff27dde138a3a5c1c8bc6d4ba9184321 100644 (file)
--- a/gl/sys_socket.in.h
+++ b/gl/sys_socket.in.h
@@ -63,9 +63,6 @@
 #ifndef _@GUARD_PREFIX@_SYS_SOCKET_H
 #define _@GUARD_PREFIX@_SYS_SOCKET_H
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_SYS_SOCKET_INLINE
 # define _GL_SYS_SOCKET_INLINE _GL_INLINE

diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h
index 84a17c9fec13085023e5c453be633d3489116e18..ef39b837bdc54a089298b922be8203c83f7ec2e1 100644 (file)
--- a/gl/sys_time.in.h
+++ b/gl/sys_time.in.h
@@ -24,12 +24,11 @@
 #endif
 @PRAGMA_COLUMNS@
 
-/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
-   recursively via <sys/select.h>.
+/* On Cygwin, <sys/time.h> includes itself recursively via <sys/select.h>.
    Simply delegate to the system's header in this case; it is a no-op.
    Without this extra ifdef, the C++ gettimeofday declaration below
    would be a forward declaration in gnulib's nested <sys/time.h>.  */
-#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
+#ifdef _CYGWIN_SYS_TIME_H
 # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
 #else
 

diff --git a/gl/tests/binary-io.h b/gl/tests/binary-io.h
index 423c2ae3fff0dde3af15e36005f6cfcf8d25b1bd..317fe3d3c20470fa779a6f72dd1a62833b12f9d5 100644 (file)
--- a/gl/tests/binary-io.h
+++ b/gl/tests/binary-io.h
@@ -25,9 +25,6 @@
    so we include it here first.  */
 #include <stdio.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef BINARY_IO_INLINE
 # define BINARY_IO_INLINE _GL_INLINE

diff --git a/gl/tests/test-sys_select.c b/gl/tests/test-sys_select.c
index 1604699879820a4c6fda12a4d76e19c22ae0769d..cd84c0103b5fd82c50e0bf24ae099ed3475bcf12 100644 (file)
--- a/gl/tests/test-sys_select.c
+++ b/gl/tests/test-sys_select.c
@@ -40,9 +40,8 @@ SIGNATURE_CHECK (FD_ZERO, void, (fd_set *));
 /* Check that the 'struct timeval' type is defined.  */
 struct timeval a;
 
-/* Check that a.tv_sec is wide enough to hold a time_t, ignoring
-   signedness issues.  */
-typedef int verify_tv_sec_type[sizeof (time_t) <= sizeof (a.tv_sec) ? 1 : -1];
+/* Check that &a.tv_sec is a 'time_t *', ignoring signedness issues.  */
+typedef int verify_tv_sec_type[sizeof (a.tv_sec) == sizeof (time_t) ? 1 : -1];
 
 /* Check that sigset_t is defined.  */
 sigset_t t2;

diff --git a/gl/tests/test-sys_time.c b/gl/tests/test-sys_time.c
index 80628423e132e93eb3a4a5c0bd44fb2ae777c811..1389b52008df080d038d841f8adc3d6daa13f3eb 100644 (file)
--- a/gl/tests/test-sys_time.c
+++ b/gl/tests/test-sys_time.c
@@ -23,9 +23,8 @@
 /* Check that the 'struct timeval' type is defined.  */
 struct timeval a;
 
-/* Check that a.tv_sec is wide enough to hold a time_t, ignoring
-   signedness issues.  */
-typedef int verify_tv_sec_type[sizeof (time_t) <= sizeof (a.tv_sec) ? 1 : -1];
+/* Check that &a.tv_sec is a 'time_t *', ignoring signedness issues.  */
+typedef int verify_tv_sec_type[sizeof (a.tv_sec) == sizeof (time_t) ? 1 : -1];
 
 int
 main (void)

diff --git a/gl/u64.h b/gl/u64.h
index de6599038a077c78340a0fe1521277a4ea08ba47..11946d4510386190caf7a18199058033b4b456b3 100644 (file)
--- a/gl/u64.h
+++ b/gl/u64.h
@@ -19,9 +19,6 @@
 
 #include <stdint.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_U64_INLINE
 # define _GL_U64_INLINE _GL_INLINE

diff --git a/gl/unistd.in.h b/gl/unistd.in.h
index 8d2f1313f103393c549b1efef31c028133f29961..69c94cce90dc12864243b53bfb15cee24b25d3e9 100644 (file)
--- a/gl/unistd.in.h
+++ b/gl/unistd.in.h
@@ -116,9 +116,6 @@
 # include <getopt.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_UNISTD_INLINE
 # define _GL_UNISTD_INLINE _GL_INLINE

diff --git a/gl/xsize.h b/gl/xsize.h
index 3014bb2e394490a936b823fdd946f7076d6a8ff4..aa08ef4885f5233bcb5ee1382cc917bef705d637 100644 (file)
--- a/gl/xsize.h
+++ b/gl/xsize.h
@@ -27,9 +27,6 @@
 # include <stdint.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef XSIZE_INLINE
 # define XSIZE_INLINE _GL_INLINE