v4l2: Don't redefine __bitwise if already set

https://bugzilla.gnome.org/show_bug.cgi?id=728438

v4l2: Don't redefine __bitwise if already set
https://bugzilla.gnome.org/show_bug.cgi?id=728438
9f936c92 · Nicolas Dufresne · 27310365 · 9f936c92
Commit 9f936c92 authored May 21, 2017 by Nicolas Dufresne
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 8 deletions

sys/v4l2/ext/types-compat.h sys/v4l2/ext/types-compat.h +13 -8

No files found.
--- a/sys/v4l2/ext/types-compat.h
+++ b/sys/v4l2/ext/types-compat.h
@@ -25,15 +25,20 @@
 #define __TYPES_COMPAT_H__

 /* From linux/types.h */
-#ifdef __CHECKER__
-#define __bitwise__ __attribute__((bitwise))
-#else
-#define __bitwise__
+#ifndef __bitwise__
+#  ifdef __CHECKER__
+#    define __bitwise__ __attribute__((bitwise))
+#  else
+#    define __bitwise__
+#  endif
 #endif
-#ifdef __CHECK_ENDIAN__
-#define __bitwise __bitwise__
-#else
-#define __bitwise
+
+#ifndef __bitwise
+#  ifdef __CHECK_ENDIAN__
+#    define __bitwise __bitwise__
+#  else
+#    define __bitwise
+#  endif
 #endif

 #define __u64 guint64