From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 21 Nov 2012 06:25:09 +0000 (-0800)
Subject: getaddrinfo: no 'static inline'
X-Git-Tag: v0.1~340
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=6c57163fce3714ebd5ee93d69e3063292b2b69fb;p=gnulib.git

getaddrinfo: no 'static inline'

* lib/getaddrinfo.c (validate_family):
Now static, not static inline.
* m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO):
Do not require AC_C_INLINE.
---

diff --git a/ChangeLog b/ChangeLog
index f13c4f818..f7549f00f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+	getaddrinfo: no 'static inline'
+	* lib/getaddrinfo.c (validate_family):
+	Now static, not static inline.
+	* m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO):
+	Do not require AC_C_INLINE.
+
 	ftruncate, fts, lstat, openat, raise: no 'static inline'
 	* lib/ftruncate.c (chsize_nothrow):
 	* lib/fts.c (opendirat, diropen):
diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index 3415e74dd..2b52d00fc 100644
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -109,7 +109,7 @@ use_win32_p (void)
 }
 #endif
 
-static inline bool
+static bool
 validate_family (int family)
 {
   /* FIXME: Support more families. */
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 9cd3e675e..8c4e46261 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 29
+# getaddrinfo.m4 serial 30
 dnl Copyright (C) 2004-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,
@@ -134,7 +134,6 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([gl_SOCKET_FAMILIES])
   AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   dnl Including sys/socket.h is wrong for Windows, but Windows does not