Avoid that the compiler warns about READ_ATTRIBUTE and WRITE_ATTRIBUTE

already being defined in <scsi/scsi.h> on RHEL 6.0, 6.1 and 6.2 (merge r4032
from trunk).


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4359 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-06-18 16:36:05 +00:00
parent a26f6128da
commit 31331411e1
+4 -2
View File
@@ -276,11 +276,13 @@ enum scst_cdb_flags {
#define INIT_ELEMENT_STATUS 0x07
#define INIT_ELEMENT_STATUS_RANGE 0x37
#define PREVENT_ALLOW_MEDIUM 0x1E
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) \
&& (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5)
#define READ_ATTRIBUTE 0x8C
#endif
#define REQUEST_VOLUME_ADDRESS 0xB5
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) \
&& (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5)
#define WRITE_ATTRIBUTE 0x8D
#endif
#define WRITE_VERIFY_16 0x8E