--- Libc/Libc-320/locale/FreeBSD/localeconv.c.patch
+++ Libc/Libc-498/locale/FreeBSD/localeconv.c.patch
@@ -1,11 +1,14 @@
---- localeconv.c.orig	Tue May 20 15:21:44 2003
-+++ localeconv.c	Thu Sep 11 13:52:19 2003
-@@ -38,10 +38,66 @@
+--- localeconv.c.orig	2004-11-25 11:38:18.000000000 -0800
++++ localeconv.c	2005-02-17 23:35:43.000000000 -0800
+@@ -38,11 +38,69 @@
  #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.12 2002/10/09 09:19:28 tjr Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $");
  
++#include "xlocale_private.h"
++
 +#include <limits.h>
  #include <locale.h>
+ 
  #include "lmonetary.h"
  #include "lnumeric.h"
  
@@ -67,17 +70,95 @@
  /* 
   * The localeconv() function constructs a struct lconv from the current
   * monetary and numeric locales.
-@@ -61,6 +117,13 @@
- localeconv()
+@@ -52,25 +110,37 @@
+  * lconv structure are computed only when the monetary or numeric 
+  * locale has been changed.
+  */
+-int __mlocale_changed = 1;
+-int __nlocale_changed = 1;
+ 
+ /*
+  * Return the current locale conversion.
+  */
+ struct lconv *
+-localeconv()
++localeconv_l(locale_t loc)
  {
-     static struct lconv ret;
+-    static struct lconv ret;
++    struct __xlocale_st_localeconv *lc;
 +
++    NORMALIZE_LOCALE(loc);
++    if (loc->__lc_localeconv && !loc->__mlocale_changed && !loc->__nlocale_changed)
++	return &loc->__lc_localeconv->__ret;
++
++    lc = (struct __xlocale_st_localeconv *)malloc(sizeof(struct __xlocale_st_localeconv));
++    lc->__refcount = 1;
++    lc->__free_extra = NULL;
++    if (loc->__lc_localeconv)
++	lc->__ret = loc->__lc_localeconv->__ret;
++    else {
++	loc->__mlocale_changed = 1;
++	loc->__nlocale_changed = 1;
++    }
+ 
+-    if (__mlocale_changed) {
++    if (loc->__mlocale_changed) {
+ 	/* LC_MONETARY part */
+         struct lc_monetary_T * mptr; 
+ 
+-#define M_ASSIGN_STR(NAME) (ret.NAME = (char*)mptr->NAME)
+-#define M_ASSIGN_CHAR(NAME) (ret.NAME = mptr->NAME[0])
++#define M_ASSIGN_STR(NAME) (lc->__ret.NAME = (char*)mptr->NAME)
++#define M_ASSIGN_CHAR(NAME) (lc->__ret.NAME = mptr->NAME[0])
+ 
+-	mptr = __get_current_monetary_locale();
++	mptr = __get_current_monetary_locale(loc);
+ 	M_ASSIGN_STR(int_curr_symbol);
+ 	M_ASSIGN_STR(currency_symbol);
+ 	M_ASSIGN_STR(mon_decimal_point);
+@@ -92,21 +162,39 @@
+ 	M_ASSIGN_CHAR(int_n_sep_by_space);
+ 	M_ASSIGN_CHAR(int_p_sign_posn);
+ 	M_ASSIGN_CHAR(int_n_sign_posn);
+-	__mlocale_changed = 0;
++	loc->__mlocale_changed = 0;
+     }
+ 
+-    if (__nlocale_changed) {
++    if (loc->__nlocale_changed) {
+ 	/* LC_NUMERIC part */
+         struct lc_numeric_T * nptr; 
+ 
+-#define N_ASSIGN_STR(NAME) (ret.NAME = (char*)nptr->NAME)
++#define N_ASSIGN_STR(NAME) (lc->__ret.NAME = (char*)nptr->NAME)
+ 
+-	nptr = __get_current_numeric_locale();
++	nptr = __get_current_numeric_locale(loc);
+ 	N_ASSIGN_STR(decimal_point);
+ 	N_ASSIGN_STR(thousands_sep);
+ 	N_ASSIGN_STR(grouping);
+-	__nlocale_changed = 0;
++	loc->__nlocale_changed = 0;
+     }
+ 
+-    return (&ret);
++    XL_RELEASE(loc->__lc_localeconv);
++    loc->__lc_localeconv = lc;
++
++    return (&lc->__ret);
++}
++
++/*
++ * Return the current locale conversion.
++ */
++struct lconv *
++localeconv()
++{
 +    /*--------------------------------------------------------------------
 +     * If _onlyClocaleconv is non-zero, just return __lconv, which is a "C"
 +     * struct lconv *.  Otherwise, do the normal thing.
 +     *--------------------------------------------------------------------*/
 +    if (_onlyClocaleconv)
 +	return &_C_lconv;
- 
-     if (__mlocale_changed) {
- 	/* LC_MONETARY part */
++    return localeconv_l(__current_locale());
+ }