From b4938324b7113c9d73f8390d21f3ecbd842e74b9 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 30 Sep 2012 16:20:43 -0700 Subject: [PATCH] sockets, sys_stat: restore AC_C_INLINE This undoes the 2012-09-22 patch. * m4/sockets.m4 (gl_SOCKETS): * m4/sys_stat_h.m4 (gl_HEADER_SYS_STAT_H): Restore AC_C_INLINE, since MSVC requires __inline or _inline and does not support plain 'inline'. Reported by Bruno Haible in . --- ChangeLog | 10 ++++++++++ m4/sockets.m4 | 3 ++- m4/sys_stat_h.m4 | 5 ++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21015d2fe..1565dfbe7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-09-30 Paul Eggert + + sockets, sys_stat: restore AC_C_INLINE + This undoes the 2012-09-22 patch. + * m4/sockets.m4 (gl_SOCKETS): + * m4/sys_stat_h.m4 (gl_HEADER_SYS_STAT_H): + Restore AC_C_INLINE, since MSVC requires __inline or _inline + and does not support plain 'inline'. Reported by Bruno Haible in + . + 2012-09-30 Bruno Haible localeconv tests: Avoid test failure on OpenIndiana. diff --git a/m4/sockets.m4 b/m4/sockets.m4 index 52c271dd3..e3738d906 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,4 +1,4 @@ -# sockets.m4 serial 8 +# sockets.m4 serial 7 dnl Copyright (C) 2008-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, @@ -6,6 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_SOCKETS], [ + AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_SOCKETLIB]) gl_PREREQ_SOCKETS ]) diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 8af3353ea..f45dee1dc 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 28 -*- Autoconf -*- +# sys_stat_h.m4 serial 27 -*- 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,6 +11,9 @@ 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]) -- 2.11.0