Libc-1244.1.7.tar.gz

[apple/libc.git] / locale / FreeBSD / setrunelocale.c

diff --git a/locale/FreeBSD/setrunelocale.c b/locale/FreeBSD/setrunelocale.c
index 213a62b9d4eaf8cb73dd9b50424fb0c3d8a0bc8e..852109cf50d5566826d5f3cdde607cd77039aec5 100644 (file)
--- a/locale/FreeBSD/setrunelocale.c
+++ b/locale/FreeBSD/setrunelocale.c
@@ -66,7 +66,7 @@ __setrunelocale(const char *encoding, locale_t loc)
        static struct __xlocale_st_runelocale *CachedRuneLocale;
        extern int __mb_cur_max;
        extern int __mb_sb_limit;
-       static pthread_lock_t cache_lock = LOCK_INITIALIZER;
+       static os_unfair_lock cache_lock = OS_UNFAIR_LOCK_INIT;
 
        /*
         * The "C" and "POSIX" locale are always here.
@@ -86,7 +86,7 @@ __setrunelocale(const char *encoding, locale_t loc)
        /*
         * If the locale name is the same as our cache, use the cache.
         */
-       LOCK(cache_lock);
+       os_unfair_lock_lock(&cache_lock);
        if (CachedRuneLocale != NULL &&
            strcmp(encoding, CachedRuneLocale->__ctype_encoding) == 0) {
                XL_RELEASE(loc->__lc_ctype);
@@ -97,10 +97,10 @@ __setrunelocale(const char *encoding, locale_t loc)
                        __mb_cur_max = loc->__lc_ctype->__mb_cur_max;
                        __mb_sb_limit = loc->__lc_ctype->__mb_sb_limit;
                }
-               UNLOCK(cache_lock);
+               os_unfair_lock_unlock(&cache_lock);
                return (0);
        }
-       UNLOCK(cache_lock);
+       os_unfair_lock_unlock(&cache_lock);
 
        /*
         * Slurp the locale file into the cache.
@@ -169,11 +169,11 @@ __setrunelocale(const char *encoding, locale_t loc)
                        __mb_cur_max = loc->__lc_ctype->__mb_cur_max;
                        __mb_sb_limit = loc->__lc_ctype->__mb_sb_limit;
                }
-               LOCK(cache_lock);
+               os_unfair_lock_lock(&cache_lock);
                XL_RELEASE(CachedRuneLocale);
                CachedRuneLocale = xrl;
                XL_RETAIN(CachedRuneLocale);
-               UNLOCK(cache_lock);
+               os_unfair_lock_unlock(&cache_lock);
        } else
                XL_RELEASE(xrl);