*printf declarations in stdio.h?

[Simon Josefsson]

I haven't been paying attention to the *printf discussions, but
looking at current CVS, shouldn't the vasprintf module use stdio.h for
the prototypes?

/Simon

2007-03-12  Simon Josefsson  <address@hidden>

        * modules/vasprintf: Depend on stdio for prototypes, and remove
        vasprintf.h.

        * lib/stdio_.h: Declare asprintf and vasprintf, from vasprintf.h.

        * lib/asprintf.c: Use stdio.h for prototypes.
        * lib/vasprintf.c: Ditto.

        * lib/vasprintf.h: File removed.

Index: modules/vasprintf
===================================================================
RCS file: /sources/gnulib/gnulib/modules/vasprintf,v
retrieving revision 1.4
diff -u -p -r1.4 vasprintf
--- modules/vasprintf   13 Oct 2006 12:40:23 -0000      1.4
+++ modules/vasprintf   12 Mar 2007 14:34:08 -0000
@@ -2,13 +2,13 @@ Description:
 vsprintf with automatic memory allocation.
 
 Files:
-lib/vasprintf.h
 lib/vasprintf.c
 lib/asprintf.c
 m4/vasprintf.m4
 
 Depends-on:
 vasnprintf
+stdio
 
 configure.ac:
 gl_FUNC_VASPRINTF
@@ -16,7 +16,7 @@ gl_FUNC_VASPRINTF
 Makefile.am:
 
 Include:
-"vasprintf.h"
+<stdio.h>
 
 License:
 LGPL
Index: lib/stdio_.h
===================================================================
RCS file: /sources/gnulib/gnulib/lib/stdio_.h,v
retrieving revision 1.13
diff -u -p -r1.13 stdio_.h
--- lib/stdio_.h        10 Mar 2007 11:24:15 -0000      1.13
+++ lib/stdio_.h        12 Mar 2007 14:34:08 -0000
@@ -183,6 +183,16 @@ extern int vsprintf (char *str, const ch
      vsprintf (b, f, a))
 #endif
 
+#if @GNULIB_VASPRINTF@
+# if REPLACE_VASPRINTF
+#  define asprintf rpl_asprintf
+#  define vasprintf rpl_vasprintf
+# endif
+  extern int asprintf (char **result, const char *format, ...)
+    __attribute__ ((__format__ (__printf__, 2, 3)));
+  extern int vasprintf (char **result, const char *format, va_list args)
+    __attribute__ ((__format__ (__printf__, 2, 0)));
+#endif
 
 #ifdef __cplusplus
 }
Index: lib/asprintf.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/asprintf.c,v
retrieving revision 1.4
diff -u -p -r1.4 asprintf.c
--- lib/asprintf.c      14 Sep 2006 14:18:36 -0000      1.4
+++ lib/asprintf.c      12 Mar 2007 14:34:08 -0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #include <config.h>
 
 /* Specification.  */
-#include "vasprintf.h"
+#include <stdio.h>
 
 #include <stdarg.h>
 
Index: lib/vasprintf.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/vasprintf.c,v
retrieving revision 1.8
diff -u -p -r1.8 vasprintf.c
--- lib/vasprintf.c     14 Sep 2006 14:18:36 -0000      1.8
+++ lib/vasprintf.c     12 Mar 2007 14:34:08 -0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #include <config.h>
 
 /* Specification.  */
-#include "vasprintf.h"
+#include <stdio.h>
 
 #include <errno.h>
 #include <limits.h>