From 660429af0232d4afcb3e03fb0437053dd6e16286 Mon Sep 17 00:00:00 2001
From: Robert de Bath <rdebath@poboxes.com>
Date: Fri, 2 Aug 2002 21:34:40 +0200
Subject: Import Dev86src-0.16.7.tar.gz

---
 libc/i386fp/Makefile     | 9 +++------
 libc/include/features.h  | 4 ++--
 libc/include/sys/cdefs.h | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'libc')

diff --git a/libc/i386fp/Makefile b/libc/i386fp/Makefile
index 46c28a9..298ca18 100644
--- a/libc/i386fp/Makefile
+++ b/libc/i386fp/Makefile
@@ -2,9 +2,7 @@
 
 .SUFFIXES: .x		# .x files are .s files that need C-preprocessing
 .x.o:
-	cp $< tmp.c
-	$(CC) $(CFLAGS) -E tmp.c >tmp.s
-	$(CC) $(CFLAGS) -c tmp.s -A-n -A$* -o $@
+	$(CC) $(CFLAGS) -c $< -o $@
 
 FPDIST		=Makefile $(FPSRC) test.c bccfp.tex
 FPSRC		=fadd.x fcomp.x fdiv.x fmul.x fbsr.x \
@@ -17,14 +15,13 @@ FPOBJ		=fadd.o fcomp.o fdiv.o fmul.o fpbsr.o \
 		fperr.o fperror.o fptoi.o fpushd.o fpulld.o \
 		fpushi.o fpushf.o fpullf.o frexp.o ftst.o \
 		fabs.o ldexp.o modf.o
-JUNK		=tmp tmp.c tmp.s tmp.lst
 LIB		=.
 
 CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
 
 ifeq ($(LIB_CPU),i386)
 all: $(LIBC)($(FPOBJ))
-	rm -f $(JUNK) $(FPOBJ)
+	rm -f $(FPOBJ)
 else
 all:
 	@:
@@ -34,5 +31,5 @@ $(LIBC)($(FPOBJ)): fplib.h
 $(LIBC)(fperr.o fperror.o): fperr.h
 
 clean:
-	rm -f $(FPOBJ) $(JUNK) test
+	rm -f $(FPOBJ) test
 	rm -f $(LIB)/libfp.a bccfp.tar.Z bccfp.uue
diff --git a/libc/include/features.h b/libc/include/features.h
index 1c7da63..cc002f6 100644
--- a/libc/include/features.h
+++ b/libc/include/features.h
@@ -7,8 +7,8 @@
 #define __P(x) x
 #define __const const
 
-/* Almost ansi */
-#if __STDC__ != 1
+/* Not really ansi */
+#ifdef __BCC__
 #define const
 #define volatile
 #endif
diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h
index 0afc883..ce975f0 100644
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
@@ -3,7 +3,7 @@
 #define __SYS_CDEFS_H
 #include <features.h>
 
-#if defined (__STDC__) && __STDC__
+#if __STDC__
 
 #define	__CONCAT(x,y)	x ## y
 #define	__STRING(x)	#x
-- 
cgit v1.2.1