diff options
| author | Paul Eggert | 2016-09-16 00:55:40 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-09-16 00:56:15 -0700 |
| commit | 8226ac0ae44411e6fcd0737987b4e0a69ced91ce (patch) | |
| tree | e15768c42252598bcb321ce86182a6c0501dd098 | |
| parent | 0bbf00c7f3de9c75372100afc3039d7f5c8a7587 (diff) | |
| download | emacs-8226ac0ae44411e6fcd0737987b4e0a69ced91ce.tar.gz emacs-8226ac0ae44411e6fcd0737987b4e0a69ced91ce.zip | |
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.
| -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 @@ | |||
| 1 | # serial 14 -*- Autoconf -*- | 1 | # serial 15 -*- Autoconf -*- |
| 2 | # Enable extensions on systems that normally disable them. | 2 | # Enable extensions on systems that normally disable them. |
| 3 | 3 | ||
| 4 | # Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc. | 4 | # 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 @@ | |||
| 1 | # stdio_h.m4 serial 47 | 1 | # stdio_h.m4 serial 48 |
| 2 | dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. |
| 3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
| 4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | 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. | |||
| 6 | 6 | ||
| 7 | AC_DEFUN([gl_STDIO_H], | 7 | AC_DEFUN([gl_STDIO_H], |
| 8 | [ | 8 | [ |
| 9 | AC_DEFINE([__USE_MINGW_ANSI_STDIO], 1, [Use GNU style printf and scanf.]) | 9 | AH_VERBATIM([MINGW_ANSI_STDIO], |
| 10 | [/* Use GNU style printf and scanf. */ | ||
| 11 | #ifndef __USE_MINGW_ANSI_STDIO | ||
| 12 | # undef __USE_MINGW_ANSI_STDIO | ||
| 13 | #endif | ||
| 14 | ]) | ||
| 15 | AC_DEFINE([__USE_MINGW_ANSI_STDIO]) | ||
| 10 | AC_REQUIRE([gl_STDIO_H_DEFAULTS]) | 16 | AC_REQUIRE([gl_STDIO_H_DEFAULTS]) |
| 11 | gl_NEXT_HEADERS([stdio.h]) | 17 | gl_NEXT_HEADERS([stdio.h]) |
| 12 | 18 | ||