about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-16 21:02:54 -0700
committerDavid S. Miller <davem@davemloft.net>2012-03-16 21:02:54 -0700
commit77e927affd576fcbb751144f60b098b7f0427045 (patch)
tree46701a3b497e9ab1a5b6e909915e33a256008cfc
parent7e7fa5f8719c0a497f4b262e6fb5625c13b6c22e (diff)
downloadglibc-77e927affd576fcbb751144f60b098b7f0427045.tar.gz
glibc-77e927affd576fcbb751144f60b098b7f0427045.tar.xz
glibc-77e927affd576fcbb751144f60b098b7f0427045.zip
Fix warnings when uintptr_t is larger than int.
	* sysdeps/unix/sysv/linux/shmat.c (shmat): Use -1l to avoid
	warnings.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/shmat.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index df662af998..c58e919738 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-03-16  David S. Miller  <davem@davemloft.net>
 
+	* sysdeps/unix/sysv/linux/shmat.c (shmat): Use -1l to avoid
+	warnings.
+
 	[BZ #6471]
 	* sysdeps/unix/sysv/linux/shmat.c (shmat): Test for syscall errors
 	properly.
diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c
index dd75491ce4..d01bb1bdb7 100644
--- a/sysdeps/unix/sysv/linux/shmat.c
+++ b/sysdeps/unix/sysv/linux/shmat.c
@@ -55,7 +55,7 @@ shmat (shmid, shmaddr, shmflg)
   if (INTERNAL_SYSCALL_ERROR_P (resultvar, err))
     {
       __set_errno (INTERNAL_SYSCALL_ERRNO (resultvar, err));
-      return (void *) -1;
+      return (void *) -1l;
     }
 
   return BOUNDED_N (raddr, length);