From c87ada6fb69c93ea7aaa0522bbac5d119ab9a4b5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 13 Jan 2019 21:41:45 +0000 Subject: [PATCH] scst: Suppress compiler warnings about redefining WRITE_VERIFY_16 on RHEL 7 git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7894 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst_const.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index 91ad94330..96e6a64a6 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -371,7 +371,8 @@ static inline int scst_sense_response_code(const uint8_t *sense) && (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5) #define WRITE_ATTRIBUTE 0x8D #endif -#if !defined(__KERNEL__) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) +#if (!defined(__KERNEL__) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) &&\ + !defined(WRITE_VERIFY_16) #define WRITE_VERIFY_16 0x8E #endif #define VERIFY_6 0x13