summaryrefslogtreecommitdiff
path: root/libc/stdio/scanf.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-11-15 21:12:09 +0000
committerEric Andersen <andersen@codepoet.org>2000-11-15 21:12:09 +0000
commitafa40ade775710f3a449e10778159ade4c133d45 (patch)
treedfcfb8d70f95e89273ee32d14c982c529c08a676 /libc/stdio/scanf.c
parentdc7f2e1bf0dc6ab6bec1d531026fb39271287711 (diff)
Add in tmpnam() support from David Whedon <dwhedon@gordian.com>,
rework include/stdio.h, and fix up the resultant damage.
Diffstat (limited to 'libc/stdio/scanf.c')
-rw-r--r--libc/stdio/scanf.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/libc/stdio/scanf.c b/libc/stdio/scanf.c
index 8ce590684..51d30cdde 100644
--- a/libc/stdio/scanf.c
+++ b/libc/stdio/scanf.c
@@ -3,14 +3,7 @@
#include <stdio.h>
#include <ctype.h>
#include <string.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#define va_strt va_start
-#else
-#include <varargs.h>
-#define va_strt(p,i) va_start(p)
-#endif
#ifdef L_scanf
#ifdef __STDC__
@@ -24,7 +17,7 @@ va_dcl
va_list ptr;
int rv;
- va_strt(ptr, fmt);
+ va_start(ptr, fmt);
rv = vfscanf(stdin, fmt, ptr);
va_end(ptr);
return rv;
@@ -49,7 +42,7 @@ va_dcl
va_list ptr;
int rv;
- va_strt(ptr, fmt);
+ va_start(ptr, fmt);
string->bufpos = (unsigned char *) ((void *) sp);
rv = vfscanf(string, fmt, ptr);
va_end(ptr);
@@ -70,7 +63,7 @@ va_dcl
va_list ptr;
int rv;
- va_strt(ptr, fmt);
+ va_start(ptr, fmt);
rv = vfscanf(fp, fmt, ptr);
va_end(ptr);
return rv;