Libc-498.1.5.tar.gz

[apple/libc.git] / locale / localeconv-fbsd.c

diff --git a/locale/localeconv-fbsd.c b/locale/localeconv-fbsd.c
index d924e0ecb596f53594d536023f0a95e7f4d839a4..f16ba6a1079b768fe4a9d3c44083b9c6ee1b70d7 100644 (file)
--- a/locale/localeconv-fbsd.c
+++ b/locale/localeconv-fbsd.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16
 #include "lmonetary.h"
 #include "lnumeric.h"
 
 #include "lmonetary.h"
 #include "lnumeric.h"
 

+#ifdef __APPLE_PR3417676_HACK__

 /*------------------------------------------------------------------------
  * PR-3417676: We need to provide a way to force "C" locale style number
  * formatting independent of the locale setting.  We provide private
 /*------------------------------------------------------------------------
  * PR-3417676: We need to provide a way to force "C" locale style number
  * formatting independent of the locale setting.  We provide private


@@ -100,6 +101,7 @@ __setonlyClocaleconv(int val)
     _onlyClocaleconv = val;
     return prev;
 }
     _onlyClocaleconv = val;
     return prev;
 }

+#endif /* __APPLE_PR3417676_HACK__ */

 
 /* 
  * The localeconv() function constructs a struct lconv from the current
 
 /* 
  * The localeconv() function constructs a struct lconv from the current


@@ -190,11 +192,13 @@ localeconv_l(locale_t loc)
 struct lconv *
 localeconv()
 {
 struct lconv *
 localeconv()
 {

+#ifdef __APPLE_PR3417676_HACK__

     /*--------------------------------------------------------------------
      * 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 _onlyClocaleconv is non-zero, just return __lconv, which is a "C"
      * struct lconv *.  Otherwise, do the normal thing.
      *--------------------------------------------------------------------*/
     if (_onlyClocaleconv)
        return &_C_lconv;

+#endif /* __APPLE_PR3417676_HACK__ */

     return localeconv_l(__current_locale());
 }
     return localeconv_l(__current_locale());
 }