about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--nptl/ChangeLog3
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h3
-rw-r--r--stdio-common/vfscanf.c2
-rw-r--r--sysdeps/generic/strcasestr.c2
5 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e2df440c5c..263c88aa8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/vfscanf.c [!COMPILE_WSCANF] (TOLOWER): Cast first
+	parameter to unsigned char.
+	* sysdeps/generic/strcasestr.c [_LIBC] (TOLOWER): Likewise.
+
 2004-03-24  Jakub Jelinek  <jakub@redhat.com>
 
 	* stdlib/strtod_l.c (INTERNAL (__STRTOF)): Clear the rest of retval,
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b0bce881cd..4b8e43d6e5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-24  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
+	(lll_mutex_cond_trylock): Define as wrapper around __lll_cond_trylock.
+
 	* sysdeps/unix/sysv/linux/getpid.c (really_getpid): Reorganize
 	code to avoid warning.
 
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
index e9f895d6e8..e107ef5975 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
@@ -101,7 +101,7 @@
 #define lll_mutex_trylock(lock)	__lll_trylock (&(lock))
 
 /* Set *futex to 2 if it is 0, atomically.  Returns the old value */
-#define lll_mutex_cond_trylock(futex) \
+#define __lll_cond_trylock(futex) \
   ({ int __val;								      \
      __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
 		       "	cmpwi	0,%0,0\n"			      \
@@ -114,6 +114,7 @@
 		       : "cr0", "memory");				      \
      __val;								      \
   })
+#define lll_mutex_cond_trylock(lock)	__lll_cond_trylock (&(lock))
 
 
 extern void __lll_lock_wait (int *futex) attribute_hidden;
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 603940da4c..ac6fcdf79f 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -119,7 +119,7 @@
 # define ISSPACE(Ch)	  __isspace_l (Ch, loc)
 # define ISDIGIT(Ch)	  __isdigit_l (Ch, loc)
 # define ISXDIGIT(Ch)	  __isxdigit_l (Ch, loc)
-# define TOLOWER(Ch)	  __tolower_l (Ch, loc)
+# define TOLOWER(Ch)	  __tolower_l ((unsigned char) (Ch), loc)
 # define ORIENT	  if (_IO_vtable_offset (s) == 0			      \
 			      && _IO_fwide (s, -1) != -1)		      \
 			    return EOF
diff --git a/sysdeps/generic/strcasestr.c b/sysdeps/generic/strcasestr.c
index 6327dfab49..1dde43c606 100644
--- a/sysdeps/generic/strcasestr.c
+++ b/sysdeps/generic/strcasestr.c
@@ -38,7 +38,7 @@
 
 #ifdef _LIBC
 # include <locale/localeinfo.h>
-# define TOLOWER(c) __tolower_l (c, loc)
+# define TOLOWER(c) __tolower_l ((unsigned char) c, loc)
 #else
 # define TOLOWER(c) _tolower (c)
 #endif