about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-17 17:27:13 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-17 17:27:13 -0700
commit428bd7074c3db7f9258294189a92f1ec19956c6e (patch)
tree474309d27387a35f04f6f19a4f6210ceaabfed12
parent3e5aef87d76cfa7354f2b0d82b96e59280720796 (diff)
downloadglibc-428bd7074c3db7f9258294189a92f1ec19956c6e.tar.gz
glibc-428bd7074c3db7f9258294189a92f1ec19956c6e.tar.xz
glibc-428bd7074c3db7f9258294189a92f1ec19956c6e.zip
Use __syscall_ulong_t in pselect.c
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/pselect.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3459871579..8a89c2dc9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/unix/sysv/linux/pselect.c (data): Use __syscall_ulong_t
+	on both fields and cast pointer to __syscall_ulong_t.
+
 	* bits/types.h (__fsword_t): New type.
 	* bits/typesizes.h (__FSWORD_T_TYPE): New macro.
 	sysdeps/mach/hurd/bits/typesizes.h (__FSWORD_T_TYPE): Likewise.
diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c
index 8864d7806c..11aa7d1b03 100644
--- a/sysdeps/unix/sysv/linux/pselect.c
+++ b/sysdeps/unix/sysv/linux/pselect.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2006.
 
@@ -52,11 +52,11 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
      be created.  */
   struct
   {
-    const sigset_t *ss;
-    size_t ss_len;
+    __syscall_ulong_t ss;
+    __syscall_ulong_t ss_len;
   } data;
 
-  data.ss = sigmask;
+  data.ss = (__syscall_ulong_t) (uintptr_t) sigmask;
   data.ss_len = _NSIG / 8;
 
   int result;