summary refs log tree commit diff
path: root/iconv/gconv_cache.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-16 05:39:18 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-16 05:39:18 +0000
commit8e2949409cf808df820797b56ec32cc7108fd3c2 (patch)
treec92225de52230a24fe48295fd43289825ba5c58c /iconv/gconv_cache.c
parent1fc0e33153186a90140c3d25f5d9b4537890d7cc (diff)
downloadglibc-8e2949409cf808df820797b56ec32cc7108fd3c2.tar.gz
glibc-8e2949409cf808df820797b56ec32cc7108fd3c2.tar.xz
glibc-8e2949409cf808df820797b56ec32cc7108fd3c2.zip
Update.
2001-08-14  Tom Rix  <trix@redhat.com>

	* iconv/gconv_cache.c (find_module): Add #ifndef STATIC_GCONV.
	* iconv/Makefile: Fix gconv_cache.c CFLAGS.

2001-08-13  Tom Rix  <trix@redhat.com>

	* sysdeps/unix/sysv/aix/Makefile: Add rule to import kernel symbols.
	* sysdeps/unix/sysv/aix/bits/types.h: Fix type of __id_t, __useconds_t
	and __intptr_t.

2001-08-15  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S (__getcontext):
	Store the access registers to the ucontext structure.
	* sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S (__getcontext):
	Likewise.

	* sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S (__setcontext):
	Load the access registers from the ucontext structure.
	* sysdeps/unix/sysv/linux/s390/s390-64/setcontext.S (__setcontext):
	Likewise.

	* sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h: Adjust the SC_xxx
	offsets to the new ucontext layout.
	* sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h: Likewise.

	* sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h: Fix the layout
	of the ucontext structure.
	* sysdeps/unix/sysv/linux/s390/s390-64/sys/ucontext.h: Likewise.
Diffstat (limited to 'iconv/gconv_cache.c')
-rw-r--r--iconv/gconv_cache.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c
index ffec34d2ec..1009cedc58 100644
--- a/iconv/gconv_cache.c
+++ b/iconv/gconv_cache.c
@@ -170,6 +170,7 @@ find_module_idx (const char *str, size_t *idxp)
 }
 
 
+#ifndef STATIC_GCONV
 static int
 internal_function
 find_module (const char *directory, const char *filename,
@@ -199,6 +200,7 @@ find_module (const char *directory, const char *filename,
 
   return status;
 }
+#endif
 
 
 int