aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-08-14 18:15:28 +0200
committerJuanma Barranquero2012-08-14 18:15:28 +0200
commite38b9db247bec5413de0cd1001d376941a59ba29 (patch)
tree8601e86d29596b8e8b990a891cc8659a21ccc3e2
parent3c3cda1a7364b3855ce458834d5fccbcfbb3c495 (diff)
downloademacs-e38b9db247bec5413de0cd1001d376941a59ba29.tar.gz
emacs-e38b9db247bec5413de0cd1001d376941a59ba29.zip
nt/config.nt: Sync with autogen/config.in.
(_GL_INLINE_HEADER_BEGIN): Update.
-rw-r--r--nt/ChangeLog7
-rw-r--r--nt/config.nt3
2 files changed, 8 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 7ad4231b611..4727950b9a9 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,10 +1,15 @@
12012-08-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * config.nt: Sync with autogen/config.in.
4 (_GL_INLINE_HEADER_BEGIN): Update.
5
12012-08-10 Glenn Morris <rgm@gnu.org> 62012-08-10 Glenn Morris <rgm@gnu.org>
2 7
3 * config.nt (DIRECTORY_SEP): Move here from src/lisp.h. 8 * config.nt (DIRECTORY_SEP): Move here from src/lisp.h.
4 9
52012-08-07 Juanma Barranquero <lekktu@gmail.com> 102012-08-07 Juanma Barranquero <lekktu@gmail.com>
6 11
7 * config.nt: Sync with autogen/config.nt. 12 * config.nt: Sync with autogen/config.in.
8 (BROKEN_GETWD, DISPNEW_NEEDS_STDIO_EXT): New macros. 13 (BROKEN_GETWD, DISPNEW_NEEDS_STDIO_EXT): New macros.
9 (PENDING_OUTPUT_COUNT): Move definition to inc/ms-w32.h. 14 (PENDING_OUTPUT_COUNT): Move definition to inc/ms-w32.h.
10 15
diff --git a/nt/config.nt b/nt/config.nt
index c1e7a917d82..8c0a1ff99e0 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1563,7 +1563,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1563# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ 1563# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
1564# define _GL_INLINE_HEADER_BEGIN \ 1564# define _GL_INLINE_HEADER_BEGIN \
1565 _Pragma ("GCC diagnostic push") \ 1565 _Pragma ("GCC diagnostic push") \
1566 _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") 1566 _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
1567 _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"")
1567# define _GL_INLINE_HEADER_END \ 1568# define _GL_INLINE_HEADER_END \
1568 _Pragma ("GCC diagnostic pop") 1569 _Pragma ("GCC diagnostic pop")
1569# endif 1570# endif