| Message ID | 20171030101440.2468-1-bgalvani@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] common: avoid conflict with __bitwise macro from linux/types.h | expand |
On Mon, Oct 30, 2017 at 11:14:40AM +0100, Beniamino Galvani wrote: > Undefine the __bitwise macro before defining it to avoid conflicts > with the one from linux/types.h; the same is done some lines above > when __CHECKER__ is defined. Fixes the following warning: > > In file included from ../src/l2_packet/l2_packet_linux.c:15:0: > hostap/src/utils/common.h:438:0: warning: "__bitwise" redefined > #define __bitwise > > In file included from /usr/include/linux/filter.h:9:0, > from ../src/l2_packet/l2_packet_linux.c:13: > /usr/include/linux/types.h:21:0: note: this is the location of the previous definition > #define __bitwise __bitwise__ Thanks, applied.
diff --git a/src/utils/common.h b/src/utils/common.h index 46e96a65b..fec7f6013 100644 --- a/src/utils/common.h +++ b/src/utils/common.h @@ -435,6 +435,7 @@ void perror(const char *s); #define __bitwise __attribute__((bitwise)) #else #define __force +#undef __bitwise #define __bitwise #endif
Undefine the __bitwise macro before defining it to avoid conflicts with the one from linux/types.h; the same is done some lines above when __CHECKER__ is defined. Fixes the following warning: In file included from ../src/l2_packet/l2_packet_linux.c:15:0: hostap/src/utils/common.h:438:0: warning: "__bitwise" redefined #define __bitwise In file included from /usr/include/linux/filter.h:9:0, from ../src/l2_packet/l2_packet_linux.c:13: /usr/include/linux/types.h:21:0: note: this is the location of the previous definition #define __bitwise __bitwise__ Signed-off-by: Beniamino Galvani <bgalvani@redhat.com> --- src/utils/common.h | 1 + 1 file changed, 1 insertion(+)