Merge from gnulib.

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])