diff options
author | Lee Duncan <lduncan@suse.com> | 2017-12-02 12:23:40 -0800 |
---|---|---|
committer | Lee Duncan <lduncan@suse.com> | 2017-12-02 12:23:40 -0800 |
commit | 1e0590d7e3e9b8d9c0ae3da4febfcc6c7836b532 (patch) | |
tree | 78aeb01ce332339aa2dac70e78bd2722424f0f3b /include | |
parent | 7b0681f1661b54b5a6eaf8bab6b41e84b28d0137 (diff) | |
download | open-iscsi-1e0590d7e3e9b8d9c0ae3da4febfcc6c7836b532.tar.gz |
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.
Diffstat (limited to 'include')
-rw-r--r-- | include/iscsi_proto.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; |