summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2002-11-14 14:06:14 +0000
committerimp <imp@FreeBSD.org>2002-11-14 14:06:14 +0000
commite8dd838bf15ab4d4e15093d2c194158023b348f0 (patch)
treef93b97dda2ddfe34c67f7d6c6de2ea1921427eb4
parente428fcdb38b8d756da3ec7fcbd2e756ad1c15073 (diff)
downloadFreeBSD-src-e8dd838bf15ab4d4e15093d2c194158023b348f0.zip
FreeBSD-src-e8dd838bf15ab4d4e15093d2c194158023b348f0.tar.gz
bde points out that the LIBC_MAJOR macro doesn't exist and requests
that we not use it here. In its place I've put a comment about the current state of play. Submitted by: bde
-rw-r--r--lib/libc/stdio/findfp.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index 40a2a04..270ec8a 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -69,9 +69,12 @@ static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
static struct __sFILEX __sFX[3];
-#if LIBC_MAJOR >= 6
-static
-#endif
+/*
+ * We can't make this 'static' until 6.0-current due to binary
+ * compatibility concerns. This also means we cannot change the
+ * sizeof(FILE) until that time either and must continue to use the
+ * __sFILEX stuff to add to FILE.
+ */
FILE __sF[3] = {
std(__SRD, STDIN_FILENO),
std(__SWR, STDOUT_FILENO),
OpenPOWER on IntegriCloud