From e6248da18100235ae33468d058e5b71fcefeff3b Mon Sep 17 00:00:00 2001
From: Robert de Bath <rdebath@poboxes.com>
Date: Sun, 28 Jul 2002 22:10:50 +0200
Subject: Import Dev86src-0.16.6.tar.gz

---
 libc/stdio/Makefile | 2 +-
 libc/stdio/printf.c | 8 ++++----
 libc/stdio/scanf.c  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'libc/stdio')

diff --git a/libc/stdio/Makefile b/libc/stdio/Makefile
index 9e96427..3c85f40 100644
--- a/libc/stdio/Makefile
+++ b/libc/stdio/Makefile
@@ -43,7 +43,7 @@ transfer:
 	cp -p stdio.h ../include/.
 
 clean:
-	rm -f *.o libc.a
+	rm -f *.o libc.a ../include/stdio.h
 
 $(LIBC)($(OBJ)): stdio.h
 
diff --git a/libc/stdio/printf.c b/libc/stdio/printf.c
index e41eca4..6e7b3e1 100644
--- a/libc/stdio/printf.c
+++ b/libc/stdio/printf.c
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#ifdef __STDC__
+#if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__)
 #include <stdarg.h>
 #define va_strt      va_start
 #else
@@ -35,7 +35,7 @@
 
 #ifdef L_printf
 
-#ifdef __STDC__
+#if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__)
 int printf(const char * fmt, ...)
 #else
 int printf(fmt, va_alist)
@@ -53,7 +53,7 @@ va_dcl
 #endif
 
 #ifdef L_sprintf
-#ifdef __STDC__
+#if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__)
 int sprintf(char * sp, const char * fmt, ...)
 #else
 int sprintf(sp, fmt, va_alist)
@@ -80,7 +80,7 @@ static FILE  string[1] =
 #endif
 
 #ifdef L_fprintf
-#ifdef __STDC__
+#if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__)
 int fprintf(FILE * fp, const char * fmt, ...)
 #else
 int fprintf(fp, fmt, va_alist)
diff --git a/libc/stdio/scanf.c b/libc/stdio/scanf.c
index 1e0f282..a49174d 100644
--- a/libc/stdio/scanf.c
+++ b/libc/stdio/scanf.c
@@ -16,7 +16,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#ifdef __STDC__
+#if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__)
 #include <stdarg.h>
 #define va_strt      va_start
 #else
@@ -25,7 +25,7 @@
 #endif
 
 #ifdef L_scanf
-#ifdef __STDC__
+#if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__)
 int scanf(const char * fmt, ...)
 #else
 int scanf(fmt, va_alist)
@@ -43,7 +43,7 @@ va_dcl
 #endif
 
 #ifdef L_sscanf
-#ifdef __STDC__
+#if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__)
 int sscanf(char * sp, const char * fmt, ...)
 #else
 int sscanf(sp, fmt, va_alist)
@@ -69,7 +69,7 @@ static FILE  string[1] =
 #endif
 
 #ifdef L_fscanf
-#ifdef __STDC__
+#if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__)
 int fscanf(FILE * fp, const char * fmt, ...)
 #else
 int fscanf(fp, fmt, va_alist)
-- 
cgit v1.2.1