Libc-763.11.tar.gz

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

diff --git a/stdio/FreeBSD/ferror.c b/stdio/FreeBSD/ferror.c
index 0f960f7385d175ee88e67437c36c74098a85033b..830fb9ba54dda50132c75d047847cf13ae091c3f 100644 (file)
--- a/stdio/FreeBSD/ferror.c
+++ b/stdio/FreeBSD/ferror.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[] = "@(#)ferror.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.9 2004/03/17 01:43:07 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
@@ -46,6 +42,7 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.9 2004/03/17 01:43:07 tjr Ex
 #include "libc_private.h"
 
 #undef ferror
+#undef ferror_unlocked
 
 int
 ferror(FILE *fp)
@@ -57,3 +54,10 @@ ferror(FILE *fp)
        FUNLOCKFILE(fp);
        return (ret);
 }
+
+int
+ferror_unlocked(FILE *fp)
+{
+
+       return (__sferror(fp));
+}