diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-22 02:46:20 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-22 02:46:20 -0700 |
| commit | e41c05e55d9c59c8ead2aa5cf96d8a97ff5826f9 (patch) | |
| tree | 7a9b5fcf0d50b0c20151f4c4274e8077f1204c57 | |
| parent | 48a24920cca0a0d4b69bb71cb680b55c55671527 (diff) | |
| download | emacs-e41c05e55d9c59c8ead2aa5cf96d8a97ff5826f9.tar.gz | |
Merge from gnulib.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | m4/sys_stat_h.m4 | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 30a431363cc..b4f74aea850 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-09-22 Paul Eggert <eggert@cs.ucla.edu> + + Merge from gnulib, incorporating: + 2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases + 2012-09-19 Tassilo Horn <tsdh@gnu.org> * doc/emacs/misc.texi (DocView Slicing): Document new slice from diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index f45dee1dc4d..8af3353ea51 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 27 -*- Autoconf -*- +# sys_stat_h.m4 serial 28 -*- Autoconf -*- dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,9 +11,6 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], [ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - dnl For the mkdir substitute. - AC_REQUIRE([AC_C_INLINE]) - dnl Check for broken stat macros. AC_REQUIRE([AC_HEADER_STAT]) |