about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/shmat.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-03 02:45:12 +0000
committerRoland McGrath <roland@gnu.org>2002-09-03 02:45:12 +0000
commita2c396f8a991e93cd606fdb9e3b4ca91fa652730 (patch)
treeef9dfd31403a02a7f206aeebe7926d2111ce312f /sysdeps/unix/sysv/linux/shmat.c
parenta37a5055dca6522713f41c40ecb5c5ab9741e733 (diff)
downloadglibc-a2c396f8a991e93cd606fdb9e3b4ca91fa652730.tar.gz
glibc-a2c396f8a991e93cd606fdb9e3b4ca91fa652730.tar.xz
glibc-a2c396f8a991e93cd606fdb9e3b4ca91fa652730.zip
* sysdeps/powerpc/elf/libc-start.c [! SHARED]: Call
	__pthread_initialize_minimal and __libc_check_standard_fds to
	match the generic version.

	* sysdeps/powerpc/Makefile (CFLAGS-pt-initfini.s): New variable.

	* sysdeps/unix/sysv/linux/shmat.c (shmat): Add a cast to avoid a
	warning when INLINE_SYSCALL macro uses the __syscall_ipc function.

	* locale/localeconv.c (__localeconv): Cast -1 to char to avoid
	warnings on platorms where char is unsigned.
Diffstat (limited to 'sysdeps/unix/sysv/linux/shmat.c')
-rw-r--r--sysdeps/unix/sysv/linux/shmat.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c
index 8168529a9f..2c243007f5 100644
--- a/sysdeps/unix/sysv/linux/shmat.c
+++ b/sysdeps/unix/sysv/linux/shmat.c
@@ -48,9 +48,10 @@ shmat (shmid, shmaddr, shmflg)
     length = shmds.shm_segsz;
 #endif
 
-  result = (void *__unbounded) INLINE_SYSCALL (ipc, 5, IPCOP_shmat, shmid, shmflg,
+  result = (void *__unbounded) INLINE_SYSCALL (ipc, 5, IPCOP_shmat,
+					       shmid, shmflg,
 					       (long int) __ptrvalue (&raddr),
-					       __ptrvalue (shmaddr));
+					       __ptrvalue ((void *) shmaddr));
   if ((unsigned long) result <= -(unsigned long) SHMLBA)
     result = raddr;