]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
common: Avoid conflict with __bitwise macro from linux/types.h
authorBeniamino Galvani <bgalvani@redhat.com>
Mon, 30 Oct 2017 10:14:40 +0000 (11:14 +0100)
committerJouni Malinen <j@w1.fi>
Tue, 14 Nov 2017 16:23:47 +0000 (18:23 +0200)
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

index 46e96a65b38df2561b04c1da383cb82f5219c8a2..fec7f6013079e7fda0a1201f230bdb52b9ced0d2 100644 (file)
@@ -435,6 +435,7 @@ void perror(const char *s);
 #define __bitwise __attribute__((bitwise))
 #else
 #define __force
+#undef __bitwise
 #define __bitwise
 #endif