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.

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
 /*

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

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)