diff options
| -rw-r--r-- | include/stdio.h | 8 | ||||
| -rw-r--r-- | lib/libc/Makefile | 1 | ||||
| -rw-r--r-- | lib/libc/stdio/findfp.c | 5 |
3 files changed, 1 insertions, 13 deletions
diff --git a/include/stdio.h b/include/stdio.h index 90160a5..3c1d639 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -138,7 +138,6 @@ typedef struct __sFILE { } FILE; __BEGIN_DECLS -extern FILE __sF[]; extern FILE *__stdinp; extern FILE *__stdoutp; extern FILE *__stderrp; @@ -204,16 +203,9 @@ __END_DECLS #define SEEK_END 2 /* set file offset to EOF plus offset */ #endif -/* To be removed by 5.0-RELEASE */ -#if (defined(__i386__) || defined(__alpha__)) && defined(_OLD_STDIO) -#define stdin (&__sF[0]) -#define stdout (&__sF[1]) -#define stderr (&__sF[2]) -#else #define stdin __stdinp #define stdout __stdoutp #define stderr __stderrp -#endif __BEGIN_DECLS /* 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) |
