about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-01-11 01:17:36 +0000
committerRoland McGrath <roland@gnu.org>2006-01-11 01:17:36 +0000
commit04a8b3013f82c7071c9990581e31a5b0a0db16ba (patch)
tree838c48bc5496874366e92739caa0360d0752b356
parenta6811b4071621b1dc00c35309ca8567567c254e0 (diff)
downloadglibc-04a8b3013f82c7071c9990581e31a5b0a0db16ba.tar.gz
glibc-04a8b3013f82c7071c9990581e31a5b0a0db16ba.tar.xz
glibc-04a8b3013f82c7071c9990581e31a5b0a0db16ba.zip
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
	(PTR_MANGLE): Fix cast.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f83690d1e4..c3aa24e1fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-01-10  Roland McGrath  <roland@redhat.com>
 
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
+	(PTR_MANGLE): Fix cast.
+
 	* timezone/test-tz.c: Revert last change, updating to match
 	tzdata2005r definition of "MST".
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
index 858b5c4757..fd67f56983 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1997,1998,1999,2000,2001,2002,2003,2004,2005
+/* Copyright (C) 1992,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -303,7 +303,7 @@
 #  define PTR_DEMANGLE2(reg, tmpreg) PTR_MANGLE2 (reg, tmpreg)
 # else
 #  define PTR_MANGLE(var) \
-  (var) = (void *) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ())
+  (var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ())
 #  define PTR_DEMANGLE(var)	PTR_MANGLE (var)
 # endif
 #endif