From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 21 Nov 2012 06:25:10 +0000 (-0800)
Subject: xvasprintf: no 'static inline'
X-Git-Tag: v0.1~338
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=67f87ce085a82dcad545f9c77dfe28837c74cf61;p=gnulib.git

xvasprintf: no 'static inline'

* lib/xvasprintf.c (xstrcat):
Now static, not static inline.
* m4/xvasprintf.m4 (gl_XVASPRINTF):
Do not require AC_C_INLINE.
---

diff --git a/ChangeLog b/ChangeLog
index 5e1f970b7..77836fd6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+	xvasprintf: no 'static inline'
+	* lib/xvasprintf.c (xstrcat):
+	Now static, not static inline.
+	* m4/xvasprintf.m4 (gl_XVASPRINTF):
+	Do not require AC_C_INLINE.
+
 	parse-datetime, parse-duration: no 'static inline'
 	* lib/parse-datetime.y (to_uchar):
 	* lib/parse-duration.c (str_const_to_ul, str_const_to_l)
diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c
index 7aaafd8c9..62132922e 100644
--- a/lib/xvasprintf.c
+++ b/lib/xvasprintf.c
@@ -29,7 +29,7 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-static inline char *
+static char *
 xstrcat (size_t argcount, va_list args)
 {
   char *result;
diff --git a/m4/xvasprintf.m4 b/m4/xvasprintf.m4
index 0e19debd4..3c6f7a5f7 100644
--- a/m4/xvasprintf.m4
+++ b/m4/xvasprintf.m4
@@ -1,11 +1,8 @@
-# xvasprintf.m4 serial 1
+# xvasprintf.m4 serial 2
 dnl Copyright (C) 2006, 2009-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,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_XVASPRINTF],
-[
-  dnl Prerequisites of lib/xvasprintf.c.
-  AC_REQUIRE([AC_C_INLINE])
-])
+dnl Prerequisites of lib/xvasprintf.c.
+AC_DEFUN([gl_XVASPRINTF], [:])