Libc-1081.1.3.tar.gz

[apple/libc.git] / stdio / FreeBSD / putchar.c

diff --git a/stdio/FreeBSD/putchar.c b/stdio/FreeBSD/putchar.c
index 5dc0170a647dd833b388ef365dd666c85e57fb2e..d07157b1f3a3bd39a3b529c97a6e4c5551a4d1df 100644 (file)
--- a/stdio/FreeBSD/putchar.c
+++ b/stdio/FreeBSD/putchar.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)putchar.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.11 2002/08/13 09:30:41 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
@@ -46,14 +42,9 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.11 2002/08/13 09:30:41 tjr
 #include "local.h"
 #include "libc_private.h"
 
-/*
- * putchar has traditionally been a macro in <stdio.h>.  That is no
- * longer true because POSIX requires it to be thread-safe.  POSIX
- * does define putchar_unlocked() which is defined as a macro and is
- * probably what you want to use instead.
- *
- * #undef putchar
- */
+#undef putchar
+#undef putchar_unlocked
+
 /*
  * A subroutine version of the macro putchar
  */
@@ -65,8 +56,16 @@ putchar(c)
        FILE *so = stdout;
 
        FLOCKFILE(so);
-       ORIENT(so, -1);
+       /* Orientation set by __sputc() when buffer is full. */
+       /* ORIENT(so, -1); */
        retval = __sputc(c, so);
        FUNLOCKFILE(so);
        return (retval);
 }
+
+int
+putchar_unlocked(int ch)
+{
+
+       return (__sputc(ch, stdout));
+}