summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2002-10-11 22:38:17 +0000
committerpeter <peter@FreeBSD.org>2002-10-11 22:38:17 +0000
commit9d7b7c1465ab07f0f838a08be1b198ddfa1e9bcb (patch)
tree469649b87a1ec369b6bffe8e398f139431d96eb7 /lib
parentc48c3e3e1c8e962ff7bd7da96280a1a2d071282e (diff)
downloadFreeBSD-src-9d7b7c1465ab07f0f838a08be1b198ddfa1e9bcb.zip
FreeBSD-src-9d7b7c1465ab07f0f838a08be1b198ddfa1e9bcb.tar.gz
Zap the early-adopter transition aid before we get into serious
5.0-R territory, as threatened. This only affects antique 5.0 systems that have not had a 'make world' done for well over a year.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/Makefile1
-rw-r--r--lib/libc/stdio/findfp.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 59e3578..757e2fa 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -10,7 +10,6 @@
# system call stubs.
LIB=c
SHLIB_MAJOR= 5
-CFLAGS+=-DLIBC_MAJOR=${SHLIB_MAJOR}
CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
AINC= -I${.CURDIR}/${MACHINE_ARCH}
CLEANFILES+=tags
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index 40a2a04..5538a57 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -69,10 +69,7 @@ static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
static struct __sFILEX __sFX[3];
-#if LIBC_MAJOR >= 6
-static
-#endif
-FILE __sF[3] = {
+static FILE __sF[3] = {
std(__SRD, STDIN_FILENO),
std(__SWR, STDOUT_FILENO),
std(__SWR|__SNBF, STDERR_FILENO)
OpenPOWER on IntegriCloud