From afa40ade775710f3a449e10778159ade4c133d45 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 15 Nov 2000 21:12:09 +0000
Subject: Add in tmpnam() support from David Whedon <dwhedon@gordian.com>,
 rework include/stdio.h, and fix up the resultant damage.

---
 libc/stdio/scanf.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'libc/stdio/scanf.c')

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;
-- 
cgit v1.2.3