summaryrefslogtreecommitdiff
path: root/iconv/gconv_int.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-09 10:04:55 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-09 10:04:55 +0000
commit9e26f1295a6924cca895566708670c6787cfaa9e (patch)
tree5a090b7db4ed62f97e58eed56946cb055fa3dd3b /iconv/gconv_int.h
parentc1b202903d28e83e4b8e8fe7b8d28490d79f0746 (diff)
Update.
* iconv/gconv_db.c: Don't define lock as static. Rename to __gconv_lock and export from the file. * iconv/gconv_int.h: Declare __gconv_lock. * libio/iofclose.c [_LIBC] (_IO_new_fclose): Lock gconv lock before __gconv_release_step calls. Patch by Shunichi Sagawa <s-sagawa@jp.fujitsu.com>. * iconv/gconv_simple.c (internal_ucs4_loop): Fix typo in last change. * iconv/gconv_db.c
Diffstat (limited to 'iconv/gconv_int.h')
-rw-r--r--iconv/gconv_int.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index a5fb728447..782e16a58a 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -22,6 +22,7 @@
#include "gconv.h"
#include <stdlib.h> /* For alloca used in macro below. */
+#include <bits/libc-lock.h>
__BEGIN_DECLS
@@ -124,6 +125,9 @@ extern struct gconv_module *__gconv_modules_db attribute_hidden;
/* Value of the GCONV_PATH environment variable. */
extern const char *__gconv_path_envvar attribute_hidden;
+/* Lock for the conversion database content. */
+__libc_lock_define (extern, __gconv_lock);
+
/* The gconv functions expects the name to be in upper case and complete,
including the trailing slashes if necessary. */