From 1e0590d7e3e9b8d9c0ae3da4febfcc6c7836b532 Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Sat, 2 Dec 2017 12:23:40 -0800
Subject: Fix duplicate define of __bitwise

Gcc version 7.2.1 and linux glibc devel version 4.14
define __bitwise and does not need open-iscsi to
do it, so check for define before doing it ourselves.
---
 include/iscsi_proto.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/iscsi_proto.h b/include/iscsi_proto.h
index 56f757b..1d14b89 100644
--- a/include/iscsi_proto.h
+++ b/include/iscsi_proto.h
@@ -45,6 +45,7 @@
 }
 #define zero_data(p) {p[0]=0;p[1]=0;p[2]=0;}
 
+#if !defined(__bitwise)
 /*
  * If running svn modules we may need to define these.
  * This should not go upstream since this is already properly defined there
@@ -59,6 +60,7 @@
 #else
 #define __bitwise
 #endif
+#endif
 
 /* initiator tags; opaque for target */
 typedef uint32_t __bitwise__ itt_t;
-- 
cgit v1.2.1