diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-04-11 19:44:05 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-04-11 19:44:05 +0000 |
| commit | a346458fa85decb63d2bf237c62f58ca46450c3b (patch) | |
| tree | d82a43a80cabe5e0a40bc173629ceec937ebb32b /wcsmbs | |
| parent | 6fd3c3fe5346f84d40dceeccbe5e9635b8dcfa52 (diff) | |
Updated to fedora-glibc-20080411T1934cvs/fedora-glibc-2_7_90-16
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/wcsmbsload.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index e82b1ffaff..2b46131b14 100644 --- a/wcsmbs/wcsmbsload.c +++ b/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. @@ -145,7 +145,7 @@ __wcsmbs_getfct (const char *to, const char *from, size_t *nstepsp) /* 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 @@ -153,7 +153,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. */ @@ -211,7 +211,7 @@ __wcsmbs_load_conv (struct locale_data *new_category) } } - __libc_lock_unlock (__libc_setlocale_lock); + __libc_rwlock_unlock (__libc_setlocale_lock); } |