aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2017-11-08 20:13:39 +0200
committerArnold D. Robbins <arnold@skeeve.com>2017-11-08 20:13:39 +0200
commit767a091d2b99cd2afe8c427ed944ba588aedb02b (patch)
tree09c41d1da127c942aa159763ea450129032260be
parenta88d9db6a0a279e6b47a4348e7df37d89e4261ed (diff)
parent67daaccf1c28720654f70c2c570d81d472a88211 (diff)
downloadegawk-767a091d2b99cd2afe8c427ed944ba588aedb02b.tar.gz
egawk-767a091d2b99cd2afe8c427ed944ba588aedb02b.tar.bz2
egawk-767a091d2b99cd2afe8c427ed944ba588aedb02b.zip
Merge branch 'master' into feature/fix-comments
-rw-r--r--missing_d/ChangeLog4
-rw-r--r--missing_d/snprintf.c16
2 files changed, 4 insertions, 16 deletions
diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog
index f430027d..8043677a 100644
--- a/missing_d/ChangeLog
+++ b/missing_d/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-07 John E. Malmberg <wb8tyw@qsl.net>
+
+ * Remove varargs.h usage in snprintf.c
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.
diff --git a/missing_d/snprintf.c b/missing_d/snprintf.c
index 9d692d5a..53b75f65 100644
--- a/missing_d/snprintf.c
+++ b/missing_d/snprintf.c
@@ -174,28 +174,12 @@ vsnprintf (char *restrict buf, size_t len,
}
int
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
snprintf (char *restrict buf, size_t len, const char *restrict fmt, ...)
-#else
-snprintf (va_alist)
- va_dcl
-#endif
{
int rv;
va_list args;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
va_start (args, fmt);
-#else
- char *buf;
- size_t len;
- char *fmt;
-
- va_start (args);
- buf = va_arg (args, char *);
- len = va_arg (args, size_t);
- fmt = va_arg (args, char *);
-#endif
rv = vsnprintf (buf, len, fmt, args);
va_end (args);
return rv;