diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-16 00:55:40 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-16 00:56:15 -0700 |
| commit | 8226ac0ae44411e6fcd0737987b4e0a69ced91ce (patch) | |
| tree | e15768c42252598bcb321ce86182a6c0501dd098 /m4 | |
| parent | 0bbf00c7f3de9c75372100afc3039d7f5c8a7587 (diff) | |
| download | emacs-8226ac0ae44411e6fcd0737987b4e0a69ced91ce.tar.gz | |
Update from gnulib
This incorporates:
2016-09-16 extensions: fix typo in comment
2016-09-16 stdio: don't redefine __USE_MINGW_ANSI_STDIO
* m4/extensions.m4, m4/stdio_h.m4: Copy from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/extensions.m4 | 2 | ||||
| -rw-r--r-- | m4/stdio_h.m4 | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/m4/extensions.m4 b/m4/extensions.m4 index 3a556b1e1f7..e114a6f7290 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,4 +1,4 @@ -# serial 14 -*- Autoconf -*- +# serial 15 -*- Autoconf -*- # Enable extensions on systems that normally disable them. # Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 5149981a804..eaa25a01d49 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 47 +# stdio_h.m4 serial 48 dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,7 +6,13 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDIO_H], [ - AC_DEFINE([__USE_MINGW_ANSI_STDIO], 1, [Use GNU style printf and scanf.]) + AH_VERBATIM([MINGW_ANSI_STDIO], +[/* Use GNU style printf and scanf. */ +#ifndef __USE_MINGW_ANSI_STDIO +# undef __USE_MINGW_ANSI_STDIO +#endif +]) + AC_DEFINE([__USE_MINGW_ANSI_STDIO]) AC_REQUIRE([gl_STDIO_H_DEFAULTS]) gl_NEXT_HEADERS([stdio.h]) |