From aa6ce3d4e31e6e138a8fa5911d801ebc5ab47473 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 11 Feb 2014 10:51:16 +0100 Subject: [PATCH] fix signed and unsigned comparision in macros in public headers gcc -Wsign-compare warns about expanded macros that were defined in standard headers (before gcc 4.8) which can make builds fail that use -Werror. changed macros: WIFSIGNALED, __CPU_op_S --- include/sched.h | 2 +- include/stdlib.h | 2 +- include/sys/wait.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sched.h b/include/sched.h index 6a6b2fcb..105dac95 100644 --- a/include/sched.h +++ b/include/sched.h @@ -78,7 +78,7 @@ int __sched_cpucount(size_t, const cpu_set_t *); int sched_getaffinity(pid_t, size_t, cpu_set_t *); int sched_setaffinity(pid_t, size_t, const cpu_set_t *); -#define __CPU_op_S(i, size, set, op) ( (i)/8 >= (size) ? 0 : \ +#define __CPU_op_S(i, size, set, op) ( (i)/8U >= (size) ? 0 : \ ((set)->__bits[(i)/8/sizeof(long)] op (1UL<<((i)%(8*sizeof(long))))) ) #define CPU_SET_S(i, size, set) __CPU_op_S(i, size, set, |=) diff --git a/include/stdlib.h b/include/stdlib.h index 1e67b896..f034c6e5 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -93,7 +93,7 @@ size_t wcstombs (char *__restrict, const wchar_t *__restrict, size_t); #define WSTOPSIG(s) WEXITSTATUS(s) #define WIFEXITED(s) (!WTERMSIG(s)) #define WIFSTOPPED(s) ((short)((((s)&0xffff)*0x10001)>>8) > 0x7f00) -#define WIFSIGNALED(s) (((s)&0xffff)-1 < 0xffu) +#define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu) int posix_memalign (void **, size_t, size_t); int setenv (const char *, const char *, int); diff --git a/include/sys/wait.h b/include/sys/wait.h index c794f5d3..50c5c709 100644 --- a/include/sys/wait.h +++ b/include/sys/wait.h @@ -50,7 +50,7 @@ pid_t wait4 (pid_t, int *, int, struct rusage *); #define WCOREDUMP(s) ((s) & 0x80) #define WIFEXITED(s) (!WTERMSIG(s)) #define WIFSTOPPED(s) ((short)((((s)&0xffff)*0x10001)>>8) > 0x7f00) -#define WIFSIGNALED(s) (((s)&0xffff)-1 < 0xffu) +#define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu) #define WIFCONTINUED(s) ((s) == 0xffff) #ifdef __cplusplus -- 2.25.1