diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-11-15 23:56:34 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-11-15 23:56:34 +0000 |
| commit | 111bb972b2b34f424d22d35ae97a24b9407fca78 (patch) | |
| tree | 002ccfeb9b2b8449eb35fdaa15bea0821551ee39 /sysdeps | |
| parent | 89554807fda029995f81010a829e674d20605bdb (diff) | |
| download | glibc-111bb972b2b34f424d22d35ae97a24b9407fca78.tar.gz glibc-111bb972b2b34f424d22d35ae97a24b9407fca78.tar.xz glibc-111bb972b2b34f424d22d35ae97a24b9407fca78.zip | |
Update.
2000-11-15 Ulrich Drepper <drepper@redhat.com> * intl/Makefile: tst-gettext2.sh does not need a third parameter. * intl/tst-gettext2.sh: Copy locale data. Adjust LOCPATH. Verify output of program. * intl/tst-gettext2.c: Set C locale if setting other locale failed. Use gettext() not _(). * locale/setlocale.c: Increment _nl_msg_cat_cntr whenever we successfully loaded a new locale. 2000-11-13 Andreas Jaeger <aj@suse.de> * configure.in: Require gcc 2.95 or newer. 2000-11-15 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/paths.h: Adjust for FHS. Patch by Arkadiusz Miskiewicz <misiek@pld.ORG.PL>. 2000-11-11 Jim Meyering <meyering@lucent.com> * string/strndup.c (strndup): Cast return value to `char *'. 2000-11-15 Jim Meyering <meyering@ascend.com> * sysdeps/generic/memchr.c: Remove some useless parentheses. [HAVE_STDLIB_H || defined _LIBC]: Include <stdlib.h>. [HAVE_BP_SYM_H || defined _LIBC]: Guard inclusion of bp-sym.h. [! (HAVE_BP_SYM_H || defined _LIBC)] (BP_SYM): Define as no-op. Also #undef __memchr. Use `weak_alias' only if it's defined. 2000-11-10 H.J. Lu <hjl@gnu.org> * Makefile.in (install): Set LANGUAGE=C LC_ALL=C.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/memchr.c | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/paths.h | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/sysdeps/generic/memchr.c b/sysdeps/generic/memchr.c index 2950a64379..688e23b810 100644 --- a/sysdeps/generic/memchr.c +++ b/sysdeps/generic/memchr.c @@ -31,15 +31,18 @@ # define __ptr_t char * #endif /* C++ or ANSI C. */ -#if defined (_LIBC) +#if defined _LIBC # include <string.h> # include <memcopy.h> -# include <stdlib.h> #else # define reg_char char #endif -#if defined (HAVE_LIMITS_H) || defined (_LIBC) +#if HAVE_STDLIB_H || defined _LIBC +# include <stdlib.h> +#endif + +#if HAVE_LIMITS_H || defined _LIBC # include <limits.h> #endif @@ -50,10 +53,14 @@ #endif #include <sys/types.h> +#if HAVE_BP_SYM_H || defined _LIBC #include <bp-sym.h> +#else +# define BP_SYM(sym) sym +#endif #undef memchr - +#undef __memchr /* Search no more than N bytes of S for C. */ __ptr_t @@ -201,4 +208,6 @@ __memchr (s, c_in, n) return 0; } +#ifdef weak_alias weak_alias (__memchr, BP_SYM (memchr)) +#endif diff --git a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h index 8d4f6fedf7..fb2c77e99b 100644 --- a/sysdeps/unix/sysv/linux/paths.h +++ b/sysdeps/unix/sysv/linux/paths.h @@ -48,18 +48,18 @@ #define _PATH_KMEM "/dev/kmem" #define _PATH_LASTLOG "/var/log/lastlog" #define _PATH_MAILDIR "/var/mail" -#define _PATH_MAN "/usr/man" +#define _PATH_MAN "/usr/share/man" #define _PATH_MEM "/dev/mem" #define _PATH_MNTTAB "/etc/fstab" #define _PATH_MOUNTED "/etc/mtab" #define _PATH_NOLOGIN "/etc/nologin" -#define _PATH_PRESERVE "/var/preserve" +#define _PATH_PRESERVE "/var/lib" #define _PATH_RWHODIR "/var/spool/rwho" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHADOW "/etc/shadow" #define _PATH_SHELLS "/etc/shells" #define _PATH_TTY "/dev/tty" -#define _PATH_UNIX "/vmlinux" +#define _PATH_UNIX "/boot/vmlinux" #define _PATH_UTMP "/var/run/utmp" #define _PATH_VI "/usr/bin/vi" #define _PATH_WTMP "/var/log/wtmp" |