asprintf.c: Consistently use either stdarg or varargs.

        * asprintf.c: Consistently use either stdarg or varargs.

Bring over from devo.

From-SVN: r15929

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index b0dc9dca2bac9ecbac65996529ca361ff853de8b..6b964483a45e61af93aa9838e4d119e06519a1f1 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 15 19:13:48 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+       * asprintf.c: Consistently use either stdarg or varargs.
+
 Tue Oct 14 12:01:00 1997  Mark Mitchell  <mmitchell@usa.net>
 
        * cplus-dem.c (demangle_signature): Don't look for return types on

diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index 1cd63978037bb0114afe6b653c72265bcc84d496..5aaf3200f0d59f806aa3583e2f51fe8244416bc3 100644 (file)
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -22,14 +22,18 @@ Boston, MA 02111-1307, USA.  */
 #include "ansidecl.h"
 #include "libiberty.h"
 
-#if defined __STDC__ || defined ALMOST_STDC
+#if defined (ANSI_PROTOTYPES) || defined (ALMOST_STDC)
+#define USE_STDARG
+#endif
+
+#ifdef USE_STDARG
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 
 /* VARARGS */
-#ifdef ANSI_PROTOTYPES
+#ifdef USE_STDARG
 int
 asprintf (char **buf, const char *fmt, ...)
 #else
@@ -42,7 +46,7 @@ asprintf (buf, fmt, va_alist)
 {
   int status;
   va_list ap;
-#ifdef ANSI_PROTOTYPES
+#ifdef USE_STDARG
   va_start (ap, fmt);
 #else
   va_start (ap);