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, 7 insertions, 2 deletions

diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index 175f5ff..bb1e3f4 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -42,8 +42,6 @@ __FBSDID("$FreeBSD$");
 #include "local.h"
 #include "libc_private.h"
 
-#undef putchar
-
 /*
  * A subroutine version of the macro putchar
  */
@@ -61,3 +59,10 @@ putchar(c)
 	FUNLOCKFILE(so);
 	return (retval);
 }
+
+int
+putchar_unlocked(int ch)
+{
+
+	return (__sputc(ch, stdout));
+}