X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/3d9156a7a519a5e3aa1b92e9d9d4b991f1aed7ff..refs/heads/master:/stdio/FreeBSD/getchar.c?ds=sidebyside diff --git a/stdio/FreeBSD/getchar.c b/stdio/FreeBSD/getchar.c index 2ea530f..a17496a 100644 --- a/stdio/FreeBSD/getchar.c +++ b/stdio/FreeBSD/getchar.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[] = "@(#)getchar.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.12 2004/03/19 09:04:56 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.15 2008/05/05 16:03:52 jhb Exp $"); /* * A subroutine version of the macro getchar. @@ -50,6 +46,7 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.12 2004/03/19 09:04:56 tjr #include "libc_private.h" #undef getchar +#undef getchar_unlocked int getchar() @@ -62,3 +59,10 @@ getchar() FUNLOCKFILE(stdin); return (retval); } + +int +getchar_unlocked(void) +{ + + return (__sgetc(stdin)); +}