about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-16 17:18:06 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-16 17:18:06 +0000
commit2f7f7bc65803510cdf137bde00fdb72c918af63c (patch)
tree5773b68d6e27f9b6bbfc1856bee4d989e7ae5cb7 /sysdeps/unix
parent90a2545a9531710730a0693f545b0225db0fa6d0 (diff)
downloadglibc-2f7f7bc65803510cdf137bde00fdb72c918af63c.tar.gz
glibc-2f7f7bc65803510cdf137bde00fdb72c918af63c.tar.xz
glibc-2f7f7bc65803510cdf137bde00fdb72c918af63c.zip
Update.
2003-06-16  Thorsten Kukuk  <kukuk@suse.de>

	* include/libc-symbols.h: Add static_link_warning macro.
	* grp/initgroups.c: Print linker warning if this function
	is called in a static linked binary.
	* nss/getXXbyYY.c: Likewise.
	* nss/getXXbyYY_r.c: Likewise.
	* nss/getXXent.c: Likewise.
	* nss/getXXent_r.c: Likewise.
	* sysdeps/posix/getaddrinfo.c: Likewise.

2003-06-16  Bruno Haible  <bruno@clisp.org>

	* iconvdata/gconv-modules (ISO-8859-15): Add aliases ISO_8859-15,
	LATIN-9.
	(ISO-8859-16): Add aliases ISO_8859-16:2001, ISO_8859-16.
	(IBM1047): Add alias IBM-1047.
	(GBK): Add aliases MS936, WINDOWS-936.

2003-06-16  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/xstatconv.c (__xstat_conv): Define even if
	defined __ASSUME_STAT64_SYSCALL && defined XSTAT_IS_XSTAT64.
	(__xstat64_conv): Change xstat_conv to __xstat_conv.

	Reported by Arnaud Desitter <arnaud.desitter@geography.oxford.ac.uk>.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/xstatconv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c
index 4e4defb489..805e339782 100644
--- a/sysdeps/unix/sysv/linux/xstatconv.c
+++ b/sysdeps/unix/sysv/linux/xstatconv.c
@@ -31,7 +31,7 @@ struct kernel_stat;
 #include <string.h>
 
 
-#ifndef __ASSUME_STAT64_SYSCALL
+#if !defined __ASSUME_STAT64_SYSCALL || defined XSTAT_IS_XSTAT64
 int
 __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
 {
@@ -108,7 +108,7 @@ int
 __xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
 {
 #ifdef XSTAT_IS_XSTAT64
-  return xstat_conv (vers, kbuf, ubuf);
+  return __xstat_conv (vers, kbuf, ubuf);
 #else
   switch (vers)
     {