summary refs log tree commit diff
path: root/iconv/gconv_conf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-03 15:46:53 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-03 15:46:53 +0000
commite62c19f12cfc377ac9ce7c037713ead5dc6b57d9 (patch)
tree95fc8aa3e3e8722cf93ae46424b059e4796464ea /iconv/gconv_conf.c
parent6f0ee4628f3075ed37481d2bdb573b6d52d9e25e (diff)
downloadglibc-e62c19f12cfc377ac9ce7c037713ead5dc6b57d9.tar.gz
glibc-e62c19f12cfc377ac9ce7c037713ead5dc6b57d9.tar.xz
glibc-e62c19f12cfc377ac9ce7c037713ead5dc6b57d9.zip
Update.
1998-04-03 15:34  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv_int.h: New file.  Internal header.
	* iconv/Makefile (distribute): Add gconv_int.h.
	* iconv/gconv.h: Remove definition which are now in gconv_int.h.
	* iconv/gconv_builtin.c: Adopt for gconv_int.h introduction.
	* iconv/gconv_close.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* iconv/gconv_db.c: Likewise.
	* iconv/gconv_dl.c: Likewise.
	* iconv/gconv_int.h: Likewise.
	* iconv/gconv_open.c: Likewise.
	* iconv/iconv.c: Likewise.
	* iconv/iconv_close.c: Likewise.
	* iconv/iconv_open.c: Likewise.
	* iconv/iconv_prog.c: Likewise.

1998-04-03  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/ksc5601.c: Correct Perl scripts and make them omit the
	missing braces.
Diffstat (limited to 'iconv/gconv_conf.c')
-rw-r--r--iconv/gconv_conf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 0c5ceef9e2..c448a160d2 100644
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -20,7 +20,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <gconv.h>
 #include <search.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,6 +27,8 @@
 #include <unistd.h>
 #include <sys/param.h>
 
+#include <gconv_int.h>
+
 
 /* This is the default path where we look for module lists.  */
 static const char default_gconv_path[] = GCONV_PATH;
@@ -369,6 +370,7 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len,
 /* Read all configuration files found in the user-specified and the default
    path.  */
 void
+internal_function
 __gconv_read_conf (void)
 {
   const char *user_path = __secure_getenv ("GCONV_PATH");