Next round of stdio changes: Remove all inlining of stdio operations and

move the definition of the type backing FILE (struct __sFILE) into an
internal header.
- Remove macros to inline certain operations from stdio.h.  Applications
  will now always call the functions instead.
- Move the various foo_unlocked() functions from unlocked.c into foo.c.
  This lets some of the inlining macros (e.g. __sfeof()) move into
  foo.c.
- Update a few comments.
- struct __sFILE can now go back to using mbstate_t, pthread_t, and
  pthread_mutex_t instead of knowing about their private, backing types.

MFC after:	1 month
Reviewed by:	kan

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index e858dd8..53a159e 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -39,9 +39,10 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include <stdio.h>
 #include "un-namespace.h"
+#include "local.h"
 #include "libc_private.h"
 
-#undef fileno
+#define	__sfileno(p)	((p)->_file)
 
 int
 fileno(FILE *fp)
@@ -54,3 +55,10 @@ fileno(FILE *fp)
 
 	return (fd);
 }
+
+int
+fileno_unlocked(FILE *fp)
+{
+
+	return (__sfileno(fp));
+}