From 56eac6ed13d62b257d56575432dff7ad00e0c235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 29 Jun 2015 10:44:08 +0200 Subject: New upstream version 1.2.17~rc1 --- gnulib/lib/Makefile.in | 3 ++- gnulib/lib/string.in.h | 21 +++++++++++++++++++-- gnulib/tests/Makefile.in | 3 ++- gnulib/tests/error.h | 14 ++++++++++++-- gnulib/tests/inttypes.in.h | 4 ++++ 5 files changed, 39 insertions(+), 6 deletions(-) (limited to 'gnulib') diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in index 67f4adccc..f6202945c 100644 --- a/gnulib/lib/Makefile.in +++ b/gnulib/lib/Makefile.in @@ -405,7 +405,6 @@ CAPNG_LIBS = @CAPNG_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COLLIE = @COLLIE@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ @@ -1259,6 +1258,7 @@ LIBSOCKET = @LIBSOCKET@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBVIRT_ADMIN_SYMBOL_FILE = @LIBVIRT_ADMIN_SYMBOL_FILE@ LIBVIRT_LXC_SYMBOL_FILE = @LIBVIRT_LXC_SYMBOL_FILE@ LIBVIRT_MAJOR_VERSION = @LIBVIRT_MAJOR_VERSION@ LIBVIRT_MICRO_VERSION = @LIBVIRT_MICRO_VERSION@ @@ -1686,6 +1686,7 @@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ +SHEEPDOGCLI = @SHEEPDOGCLI@ SHELL = @SHELL@ SHOWMOUNT = @SHOWMOUNT@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ diff --git a/gnulib/lib/string.in.h b/gnulib/lib/string.in.h index fefc42189..47e11883e 100644 --- a/gnulib/lib/string.in.h +++ b/gnulib/lib/string.in.h @@ -15,16 +15,32 @@ You should have received a copy of the GNU Lesser General Public License along with this program; if not, see . */ -#ifndef _@GUARD_PREFIX@_STRING_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#if defined _GL_ALREADY_INCLUDING_STRING_H +/* Special invocation convention: + - On OS X/NetBSD we have a sequence of nested includes + -> -> "string.h" + In this situation system _chk variants due to -D_FORTIFY_SOURCE + might be used after any replacements defined here. */ + +#@INCLUDE_NEXT@ @NEXT_STRING_H@ + +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_STRING_H + +#define _GL_ALREADY_INCLUDING_STRING_H + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STRING_H@ +#undef _GL_ALREADY_INCLUDING_STRING_H + #ifndef _@GUARD_PREFIX@_STRING_H #define _@GUARD_PREFIX@_STRING_H @@ -1027,3 +1043,4 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp is unportable - " #endif /* _@GUARD_PREFIX@_STRING_H */ #endif /* _@GUARD_PREFIX@_STRING_H */ +#endif diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in index c06940004..74b33502d 100644 --- a/gnulib/tests/Makefile.in +++ b/gnulib/tests/Makefile.in @@ -1860,7 +1860,6 @@ CAPNG_LIBS = @CAPNG_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -COLLIE = @COLLIE@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ @@ -2714,6 +2713,7 @@ LIBSOCKET = @LIBSOCKET@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBVIRT_ADMIN_SYMBOL_FILE = @LIBVIRT_ADMIN_SYMBOL_FILE@ LIBVIRT_LXC_SYMBOL_FILE = @LIBVIRT_LXC_SYMBOL_FILE@ LIBVIRT_MAJOR_VERSION = @LIBVIRT_MAJOR_VERSION@ LIBVIRT_MICRO_VERSION = @LIBVIRT_MICRO_VERSION@ @@ -3141,6 +3141,7 @@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ +SHEEPDOGCLI = @SHEEPDOGCLI@ SHELL = @SHELL@ SHOWMOUNT = @SHOWMOUNT@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ diff --git a/gnulib/tests/error.h b/gnulib/tests/error.h index ccffef585..eb4fb7017 100644 --- a/gnulib/tests/error.h +++ b/gnulib/tests/error.h @@ -31,6 +31,16 @@ # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif +/* On mingw, the flavor of printf depends on whether the extensions module + * is in use; the check for determines the witness macro. */ +#ifndef _GL_ATTRIBUTE_SPEC_PRINTF +# if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU +# define _GL_ATTRIBUTE_SPEC_PRINTF __gnu_printf__ +# else +# define _GL_ATTRIBUTE_SPEC_PRINTF __printf__ +# endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -40,11 +50,11 @@ extern "C" { If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ extern void error (int __status, int __errnum, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)); + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 3, 4)); extern void error_at_line (int __status, int __errnum, const char *__fname, unsigned int __lineno, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6)); + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 5, 6)); /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this diff --git a/gnulib/tests/inttypes.in.h b/gnulib/tests/inttypes.in.h index 13a72bee9..78846f696 100644 --- a/gnulib/tests/inttypes.in.h +++ b/gnulib/tests/inttypes.in.h @@ -51,6 +51,10 @@ #endif /* Get CHAR_BIT. */ #include +/* On mingw, __USE_MINGW_ANSI_STDIO only works if is also included */ +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# include +#endif #if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) # error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to ." -- cgit v1.2.3