--- Libc/Libc-1725.40.4/stdio/FreeBSD/fputwc.c
+++ Libc/Libc-498/stdio/FreeBSD/fputwc.c
@@ -25,9 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.11 2008/04/17 22:17:53 jhb Exp $");
-
-#include "xlocale_private.h"
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.10 2004/07/20 08:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
@@ -43,14 +41,13 @@
 /*
  * Non-MT-safe version.
  */
-__private_extern__ wint_t
-__fputwc(wchar_t wc, FILE *fp, locale_t loc)
+wint_t
+__fputwc(wchar_t wc, FILE *fp)
 {
 	char buf[MB_LEN_MAX];
 	size_t i, len;
-	struct xlocale_ctype *xrl = XLOCALE_CTYPE(loc);
 
-	if (xrl->__mb_cur_max == 1 && wc > 0 && wc <= UCHAR_MAX) {
+	if (MB_CUR_MAX == 1 && wc > 0 && wc <= UCHAR_MAX) {
 		/*
 		 * Assume single-byte locale with no special encoding.
 		 * A more careful test would be to check
@@ -59,7 +56,8 @@
 		*buf = (unsigned char)wc;
 		len = 1;
 	} else {
-		if ((len = XLOCALE_CTYPE(loc)->__wcrtomb(buf, wc, &fp->_mbstate, loc)) == (size_t)-1) {
+		if ((len = __wcrtomb(buf, wc, &fp->_extra->mbstate)) ==
+		    (size_t)-1) {
 			fp->_flags |= __SERR;
 			return (WEOF);
 		}
@@ -82,22 +80,8 @@
 
 	FLOCKFILE(fp);
 	ORIENT(fp, 1);
-	r = __fputwc(wc, fp, __current_locale());
+	r = __fputwc(wc, fp);
 	FUNLOCKFILE(fp);
 
 	return (r);
 }
-
-wint_t
-fputwc_l(wchar_t wc, FILE *fp, locale_t loc)
-{
-	wint_t r;
-
-	NORMALIZE_LOCALE(loc);
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	r = __fputwc(wc, fp, loc);
-	FUNLOCKFILE(fp);
-
-	return (r);
-}