diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-04-11 12:45:38 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-04-11 12:45:38 +0000 |
| commit | b0eaca4212adbb440bab783f5f9ebfed7798db80 (patch) | |
| tree | 0f73d43014b419947f84181e4a94fdf2f20ead76 /libc/wcsmbs | |
| parent | 8f50aae34899188b08cfed79bb519d353510c702 (diff) | |
| download | eglibc2-b0eaca4212adbb440bab783f5f9ebfed7798db80.tar.gz | |
Merge changes between r5854 and r5879 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@5880 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/wcsmbs')
| -rw-r--r-- | libc/wcsmbs/wcsmbsload.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/wcsmbs/wcsmbsload.c b/libc/wcsmbs/wcsmbsload.c index 6531775ce..6061e4200 100644 --- a/libc/wcsmbs/wcsmbsload.c +++ b/libc/wcsmbs/wcsmbsload.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2002,2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1998-2002,2004,2005,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -147,7 +147,7 @@ __wcsmbs_getfct (const char *to, const char *from, size_t *nstepsp) #if __OPTION_EGLIBC_LOCALE_CODE /* Some of the functions here must not be used while setlocale is called. */ -__libc_lock_define (extern, __libc_setlocale_lock attribute_hidden) +__libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) /* Load conversion functions for the currently selected locale. */ void @@ -155,7 +155,7 @@ internal_function __wcsmbs_load_conv (struct locale_data *new_category) { /* Acquire the lock. */ - __libc_lock_lock (__libc_setlocale_lock); + __libc_rwlock_wrlock (__libc_setlocale_lock); /* We should repeat the test since while we waited some other thread might have run this function. */ @@ -213,7 +213,7 @@ __wcsmbs_load_conv (struct locale_data *new_category) } } - __libc_lock_unlock (__libc_setlocale_lock); + __libc_rwlock_unlock (__libc_setlocale_lock); } #else void |