Mercurial > gnulib
changeset 19099:5b10f2f518d5
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnulib into pygnulib
| author | Dmitry Selyutin <ghostmansd@gmail.com> |
|---|---|
| date | Sun, 27 Aug 2017 14:30:26 +0300 |
| parents | 3e2823e05a8d (current diff) dccbe71d55ba (diff) |
| children | 1895d53f0837 |
| files | |
| diffstat | 6 files changed, 29 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Aug 27 14:29:47 2017 +0300 +++ b/ChangeLog Sun Aug 27 14:30:26 2017 +0300 @@ -1,3 +1,20 @@ +2017-08-24 Paul Eggert <eggert@cs.ucla.edu> + + glob: try to port recent changes to MS-Windows + Problem reported by Bruno Haible in: + http://lists.gnu.org/archive/html/bug-gnulib/2017-08/msg00170.html + * lib/glob.c (__glob_pattern_p) [!_LIBC]: Move from here ... + * lib/glob.in.h (__glob_pattern_p): ... to here. + +2017-08-24 Eric Blake <eblake@redhat.com> + + warnings: fix compilation with old autoconf + * m4/warnings.m4 (gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)) + (gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)): Use m4_defun rather than + AC_DEFUN. + * m4/manywarnings.m4 (gl_MANYWARN_ALL_GCC(C)) + (gl_MANYWARN_ALL_GCC(C++)): Likewise. + 2017-08-24 Bruno Haible <bruno@clisp.org> glob: Fix compilation error on NetBSD 7.0 and OpenBSD 6.0.
--- a/doc/gnulib-intro.texi Sun Aug 27 14:29:47 2017 +0300 +++ b/doc/gnulib-intro.texi Sun Aug 27 14:30:26 2017 +0300 @@ -156,6 +156,7 @@ @item HP-UX 11.31 is very rarely tested. @item +@c IRIX 6.5 cc has no option for C99 support. You would need to use gcc instead. IRIX 6.5 is no longer tested. @item OSF/1 5.1 is no longer tested.
--- a/lib/glob.c Sun Aug 27 14:29:47 2017 +0300 +++ b/lib/glob.c Sun Aug 27 14:30:26 2017 +0300 @@ -71,7 +71,6 @@ # define __alloca alloca # endif # define __readdir readdir -# define __glob_pattern_p glob_pattern_p # define COMPILE_GLOB64 #endif /* _LIBC */
--- a/lib/glob.in.h Sun Aug 27 14:29:47 2017 +0300 +++ b/lib/glob.in.h Sun Aug 27 14:30:26 2017 +0300 @@ -85,6 +85,7 @@ #define glob rpl_glob #define globfree rpl_globfree #define glob_pattern_p rpl_glob_pattern_p +#define __glob_pattern_p glob_pattern_p #define __GLOB_GNULIB 1
--- a/m4/manywarnings.m4 Sun Aug 27 14:29:47 2017 +0300 +++ b/m4/manywarnings.m4 Sun Aug 27 14:30:26 2017 +0300 @@ -1,4 +1,4 @@ -# manywarnings.m4 serial 11 +# manywarnings.m4 serial 12 dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -39,7 +39,8 @@ [_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) # Specialization for _AC_LANG = C. -AC_DEFUN([gl_MANYWARN_ALL_GCC(C)], +# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. +m4_defun([gl_MANYWARN_ALL_GCC(C)], [ AC_LANG_PUSH([C]) @@ -316,7 +317,8 @@ ]) # Specialization for _AC_LANG = C++. -AC_DEFUN([gl_MANYWARN_ALL_GCC(C++)], +# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. +m4_defun([gl_MANYWARN_ALL_GCC(C++)], [ gl_MANYWARN_ALL_GCC_CXX_IMPL([$1]) ])
--- a/m4/warnings.m4 Sun Aug 27 14:29:47 2017 +0300 +++ b/m4/warnings.m4 Sun Aug 27 14:30:26 2017 +0300 @@ -1,4 +1,4 @@ -# warnings.m4 serial 12 +# warnings.m4 serial 13 dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -59,7 +59,8 @@ [_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) # Specialization for _AC_LANG = C. This macro can be AC_REQUIREd. -AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)], +# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. +m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)], [ AC_LANG_PUSH([C]) gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL @@ -67,7 +68,8 @@ ]) # Specialization for _AC_LANG = C++. This macro can be AC_REQUIREd. -AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], +# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. +m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], [ AC_LANG_PUSH([C++]) gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL