generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am e84cfbef: am b7b4f5b8: Merge "update signal.h to be C90 compatable"

Browse Source 
* commit 'e84cfbefd82f552490c580d35a54db4f53b6e5fb':
  update signal.h to be C90 compatable
This commit is contained in:
Elliott Hughes 2013-06-05 18:14:30 -07:00 committed by Android Git Automerger
commit b166e699dc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/include/signal.h
View File

@ -59,32 +59,32 @@ extern const char* const sys_signame[];
static __inline__ int sigismember(const sigset_t* set, int signum) { static __inline__ int sigismember(const sigset_t* set, int signum) {
int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0. int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0.
const unsigned long* local_set = (const unsigned long*) set;
if (set == NULL || bit < 0 || bit >= (int) (8*sizeof(sigset_t))) { if (set == NULL || bit < 0 || bit >= (int) (8*sizeof(sigset_t))) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
const unsigned long* local_set = (const unsigned long*) set;
return (int) ((local_set[bit / LONG_BIT] >> (bit % LONG_BIT)) & 1); return (int) ((local_set[bit / LONG_BIT] >> (bit % LONG_BIT)) & 1);
} }
static __inline__ int sigaddset(sigset_t* set, int signum) { static __inline__ int sigaddset(sigset_t* set, int signum) {
int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0. int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0.
unsigned long* local_set = (unsigned long*) set;
if (set == NULL || bit < 0 || bit >= (int) (8*sizeof(sigset_t))) { if (set == NULL || bit < 0 || bit >= (int) (8*sizeof(sigset_t))) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
unsigned long* local_set = (unsigned long*) set;
local_set[bit / LONG_BIT] |= 1UL << (bit % LONG_BIT); local_set[bit / LONG_BIT] |= 1UL << (bit % LONG_BIT);
return 0; return 0;
} }
static __inline__ int sigdelset(sigset_t* set, int signum) { static __inline__ int sigdelset(sigset_t* set, int signum) {
int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0. int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0.
unsigned long* local_set = (unsigned long*) set;
if (set == NULL || bit < 0 || bit >= (int) (8*sizeof(sigset_t))) { if (set == NULL || bit < 0 || bit >= (int) (8*sizeof(sigset_t))) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
unsigned long* local_set = (unsigned long*) set;
local_set[bit / LONG_BIT] &= ~(1UL << (bit % LONG_BIT)); local_set[bit / LONG_BIT] &= ~(1UL << (bit % LONG_BIT));
return 0; return 0;
} }