xlat/scsi_sg_commands: use XLAT_MACROS_ONLY instead of #stop

* xlat/scsi_sg_commands.in: Remove #stop.
* scsi.c: Wrap "xlat/scsi_sg_commands.h" inclusion in XLAT_MACROS_ONLY.
* tests/ioctl_scsi.c: Likewise.
* tests/ioctl_sg_io_v4.c: Likewise.

diff --git a/scsi.c b/scsi.c
index 02749a38bbd9d9528c7f61a951f59bc38317977c..2103878e08d1dc3be8225195f53967dbdd66a08f 100644 (file)
--- a/scsi.c
+++ b/scsi.c
@@ -12,7 +12,9 @@
 # include <scsi/sg.h>
 #endif
 
-#include "xlat/scsi_sg_commands.h"
+#define XLAT_MACROS_ONLY
+# include "xlat/scsi_sg_commands.h"
+#undef XLAT_MACROS_ONLY
 #include "xlat/sg_scsi_reset.h"
 
 static int

diff --git a/tests/ioctl_scsi.c b/tests/ioctl_scsi.c
index b6347b62806860c77c9b180a555dee63a0ddedca..408ac779e484e3252f09ce6afb486c7d4205e121 100644 (file)
--- a/tests/ioctl_scsi.c
+++ b/tests/ioctl_scsi.c
@@ -15,7 +15,9 @@
 # include <stdio.h>
 # include <sys/ioctl.h>
 # include <scsi/sg.h>
-# include "xlat/scsi_sg_commands.h"
+# define XLAT_MACROS_ONLY
+#  include "xlat/scsi_sg_commands.h"
+# undef XLAT_MACROS_ONLY
 
 # define TEST_NO_ARG(cmd)                                                      \
        do {                                                                    \

diff --git a/tests/ioctl_sg_io_v4.c b/tests/ioctl_sg_io_v4.c
index 59438285a2720c6aba0b105fcc9e98cbf2f2e941..a20a8d760856ce3486175ea5027c39c3c7936fc0 100644 (file)
--- a/tests/ioctl_sg_io_v4.c
+++ b/tests/ioctl_sg_io_v4.c
@@ -16,8 +16,9 @@
 # include <sys/ioctl.h>
 # include <sys/uio.h>
 # include <linux/bsg.h>
-
-# include "xlat/scsi_sg_commands.h"
+# define XLAT_MACROS_ONLY
+#  include "xlat/scsi_sg_commands.h"
+# undef XLAT_MACROS_ONLY
 
 int
 main(void)

diff --git a/xlat/scsi_sg_commands.in b/xlat/scsi_sg_commands.in
index e95e0d12af21528c19deb214301223ab02fbc254..44631b5335ceb9ad2655ea8c4dd4eff1e8dcc432 100644 (file)
--- a/xlat/scsi_sg_commands.in
+++ b/xlat/scsi_sg_commands.in
@@ -23,4 +23,3 @@ SG_GET_REQUEST_TABLE  0x2286
 SG_SET_KEEP_ORPHAN     0x2287
 SG_GET_KEEP_ORPHAN     0x2288
 SG_GET_ACCESS_COUNT    0x2289
-#stop