aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-12 18:06:31 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-12 18:06:31 +0000
commitd2537a474cb637bc49abc0baad75c01e5c245752 (patch)
treea6e20bfadb0fc266093fe40639ff7a0bf8b0619f /string
parent085320f505022f7fbc53b229ef1dc31826e66c34 (diff)
downloadglibc-d2537a474cb637bc49abc0baad75c01e5c245752.tar
glibc-d2537a474cb637bc49abc0baad75c01e5c245752.tar.gz
glibc-d2537a474cb637bc49abc0baad75c01e5c245752.tar.bz2
glibc-d2537a474cb637bc49abc0baad75c01e5c245752.zip
Update.
1998-11-12 Ulrich Drepper <drepper@cygnus.com> * inet/netinet/in.h: Add a few more IPPROTO_* macros. * libio/Makefile (headers): Add bits/stdio.h. * libio/iofread_u.c: Undefine fread_unlocked before definition. * libio/iofwrite_u.c: Undefine fwrite_unlocked before definition. * libio/stdio.h: Move optimizations into ... * libio/bits/stdio.h: ...here. New file. * libio/iofread.c: Pretty print. 1998-11-12 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/gnu/bits/utmpx.h: Protect members of struct __exit_status with `__'. Rename pad member of struct utmpx to __unused. (RUN_LVL): Define unconditionally. * sysdeps/gnu/bits/utmp.h: Rename pad member of struct utmpx to __unused. 1998-11-12 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/netlink/netlink.h: New file, support for Linux AF_NETLINK sockets (needed since the kernel version is unusable). * sysdeps/unix/sysv/linux/Makefile: Install it. * sysdeps/unix/sysv/linux/Dist: Distribute it. 1998-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> * timezone/tst-timezone.c (tests): Add entry for America/Chicago to test for bug in PR libc/863. 1998-11-12 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Cleanup comment. * elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Rename macro parameter lazy to do_lazy to avoid clashing with struct member name. Reported by Ralf Baechle <ralf@uni-koblenz.de>. 1998-11-10 H.J. Lu <hjl@gnu.org> * sysdeps/unix/sysv/linux/bits/local_lim.h: Undefine NR_OPEN if it is defined in <linux/limits.h>. 1998-11-09 13:07 -0500 Zack Weinberg <zack@rabi.phys.columbia.edu> * include/protocols/routed.h: Include the real header with a full path from the top of the source tree. * include/protocols/rwhod.h: Likewise. * include/protocols/talkd.h: Likewise. * include/protocols/timed.h: Likewise. * timezone/Makefile: Don't include z.ZONE files if no_deps is set, not if avoid-generated is set. 1998-11-12 Ulrich Drepper <drepper@cygnus.com> * signal/signal.h: Undo last change. Get definition of timespec if __USE_POSIX199309. * string/bits/string2.h (__strpbrk_c2): Add intermediate cast to size_t to prevent gcc warning when using -Wqual-cast. (__strpbrk_c3): Likewise. Suggested by Alan Curry <pacman@cqc.com>.
Diffstat (limited to 'string')
-rw-r--r--string/bits/string2.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 4efa5251f7..4904a3e4c0 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -822,7 +822,7 @@ __strpbrk_c2 (__const char *__s, char __accept1, char __accept2)
/* Please note that __accept1 and __accept2 never can be '\0'. */
while (*__s != '\0' && *__s != __accept1 && *__s != __accept2)
++__s;
- return *__s == '\0' ? NULL : (char *) __s;
+ return *__s == '\0' ? NULL : (char *) (size_t) __s;
}
__STRING_INLINE char *__strpbrk_c3 (__const char *__s, char __accept1,
@@ -835,7 +835,7 @@ __strpbrk_c3 (__const char *__s, char __accept1, char __accept2,
while (*__s != '\0' && *__s != __accept1 && *__s != __accept2
&& *__s != __accept3)
++__s;
- return *__s == '\0' ? NULL : (char *) __s;
+ return *__s == '\0' ? NULL : (char *) (size_t) __s;
}
#endif
@@ -845,7 +845,7 @@ __strpbrk_c3 (__const char *__s, char __accept1, char __accept2,
# define strstr(haystack, needle) \
(__extension__ (__builtin_constant_p (needle) && __string2_1bptr_p (needle) \
? (((__const char *) (needle))[0] == '\0' \
- ? (char *) (haystack) \
+ ? (char *) (size_t) (haystack) \
: (((__const char *) (needle))[1] == '\0' \
? strchr (haystack, \
((__const char *) (needle))[0]) \
@@ -1011,7 +1011,7 @@ __strsep_g (char **__s, __const char *__reject)
#endif
/* We need the memory allocation functions for inline strdup().
- Referring to stdlib.h (even minimally) is not allowed
+ Referring to stdlib.h (even minimally) is not allowed
in any of the tight standards compliant modes. */
#ifdef __USE_MISC