summaryrefslogtreecommitdiff
path: root/intl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-26 05:07:13 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-26 05:07:13 +0000
commitac5e137cd9154594cc46f5925276e4fa2f596fa0 (patch)
treef893afca9f452a1ada082e7b5857b77d89d2453e /intl
parentce7265c7438e18f2e4ea81582131a783a1cdd601 (diff)
downloadglibc-ac5e137cd9154594cc46f5925276e4fa2f596fa0.tar.gz
Update.
Diffstat (limited to 'intl')
-rw-r--r--intl/l10nflist.c1
-rw-r--r--intl/loadinfo.h3
-rw-r--r--intl/loadmsgcat.c8
3 files changed, 5 insertions, 7 deletions
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 5a366e59fb..7ffb4ab590 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -280,7 +280,6 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
|| ((mask & XPG_CODESET) != 0
&& (mask & XPG_NORM_CODESET) != 0));
retval->data = NULL;
- __libc_lock_init_recursive (retval->lock);
if (last == NULL)
{
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 913022eb7b..2c1b44cec4 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -20,8 +20,6 @@
#ifndef _LOADINFO_H
#define _LOADINFO_H 1
-#include <bits/libc-lock.h>
-
/* Declarations of locale dependent catalog lookup functions.
Implemented in
@@ -63,7 +61,6 @@ struct loaded_l10nfile
{
const char *filename;
int decided;
- __libc_lock_define_recursive (, lock);
const void *data;
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index ec886d9bd7..efefc69a43 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -88,6 +88,7 @@ char *alloca ();
#ifdef _LIBC
# include "../locale/localeinfo.h"
# include <not-cancel.h>
+# include <bits/libc-lock.h>
#endif
/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
@@ -899,6 +900,7 @@ _nl_load_domain (domain_file, domainbinding)
struct loaded_l10nfile *domain_file;
struct binding *domainbinding;
{
+ __libc_lock_define_initialized_recursive (static, lock);
int fd = -1;
size_t size;
#ifdef _LIBC
@@ -912,7 +914,7 @@ _nl_load_domain (domain_file, domainbinding)
int revision;
const char *nullentry;
- __libc_lock_lock_recursive (domain_file->lock);
+ __libc_lock_lock_recursive (lock);
if (domain_file->decided != 0)
{
/* There are two possibilities:
@@ -925,7 +927,7 @@ _nl_load_domain (domain_file, domainbinding)
Not necessary anymore since if the lock is available this
is finished.
*/
- __libc_lock_unlock_recursive (domain_file->lock);
+ __libc_lock_unlock_recursive (lock);
return;
}
@@ -1400,7 +1402,7 @@ _nl_load_domain (domain_file, domainbinding)
domain_file->decided = 1;
- __libc_lock_unlock_recursive (domain_file->lock);
+ __libc_lock_unlock_recursive (lock);
}