summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2002-11-04 03:23:56 +0000
committeralfred <alfred@FreeBSD.org>2002-11-04 03:23:56 +0000
commite08a3f47cf017124cfdd6dd81c1ee9bdd35e3306 (patch)
treef57ee4f74773102ae5cfdd3cc73849b40c4b9a31 /lib
parentc3a4aaf5731a8bbbb62805ead05c878d79be4396 (diff)
downloadFreeBSD-src-e08a3f47cf017124cfdd6dd81c1ee9bdd35e3306.zip
FreeBSD-src-e08a3f47cf017124cfdd6dd81c1ee9bdd35e3306.tar.gz
Backout "compatibility hack" for __sF.
Requested by: Steve Kargl <sgk@troutmask.apl.washington.edu> (submitter)
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/stdio/Makefile.inc4
-rw-r--r--lib/libc/stdio/findfp.c6
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index 3841cfc..7ab0337 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -4,10 +4,6 @@
# stdio sources
.PATH: ${.CURDIR}/../libc/stdio
-.if WANT_COMPAT4_STDIO
-CFLAGS+=-DCOMPAT4_STDIO
-.endif
-
SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \
fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \
fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index 283ff5c..5538a57 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -69,16 +69,12 @@ static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
static struct __sFILEX __sFX[3];
-#ifndef COMPAT4_STDIO
-static
-#endif
-FILE __sF[3] = {
+static FILE __sF[3] = {
std(__SRD, STDIN_FILENO),
std(__SWR, STDOUT_FILENO),
std(__SWR|__SNBF, STDERR_FILENO)
};
-
/*
* The following kludge is done to ensure enough binary compatibility
* with future versions of libc. Or rather it allows us to work with
OpenPOWER on IntegriCloud