about summary refs log tree commit diff
path: root/sysdeps/i386/i486
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-05-05 18:43:04 +0000
committerUlrich Drepper <drepper@redhat.com>2004-05-05 18:43:04 +0000
commit495961c076f3f273b3fe893ba2f5dceb7aeb4a55 (patch)
tree9baf6dbbc5f8fd1f36e070b7bad39e7bb0eeb225 /sysdeps/i386/i486
parent2d7ae2107d3713981a66011ec62d094e32ec46fb (diff)
downloadglibc-495961c076f3f273b3fe893ba2f5dceb7aeb4a55.tar.gz
glibc-495961c076f3f273b3fe893ba2f5dceb7aeb4a55.tar.xz
glibc-495961c076f3f273b3fe893ba2f5dceb7aeb4a55.zip
Update.
2004-05-05  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/alpha/atomicity.h: Remove.
	* sysdeps/generic/atomicity.h: Remove.

2004-05-05  H.J. Lu  <hongjiu.lu@intel.com>

	* sysdeps/i386/i486/bits/string.h (strpbrk): Cast return to
	char *.
Diffstat (limited to 'sysdeps/i386/i486')
-rw-r--r--sysdeps/i386/i486/bits/string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index 2a6aa48b5b..099d720a4c 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -1,5 +1,5 @@
 /* Optimized, inlined string functions.  i486 version.
-   Copyright (C) 1997,1998,1999,2000,2001,2002,2003
+   Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004
    	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -1732,7 +1732,7 @@ __strspn_g (__const char *__s, __const char *__accept)
 #define strpbrk(s, accept) \
   (__extension__ (__builtin_constant_p (accept) && sizeof ((accept)[0]) == 1  \
 		  ? ((accept)[0] == '\0'				      \
-		     ? ((void) (s), NULL)				      \
+		     ? ((void) (s), (char *) 0)				      \
 		     : ((accept)[1] == '\0'				      \
 			? strchr ((s), (accept)[0])			      \
 			: __strpbrk_cg ((s), (accept), strlen (accept))))     \