loop: use XLAT_MACROS_ONLY instead of #stop

As the former allows controlling presence of xlat definitions
during the inclusion and not header generation.

* xlat/loop_cmds.in: remove #stop.
* loop.c: Wrap "xlat/loop_cmds.h" inclusion in XLAT_MACROS_ONLY.
* tests/ioctl_loop.c: Likewise.

diff --git a/loop.c b/loop.c
index ad60770f8e671d0681544c449db33d7f950336d5..4cda42dba58327e2987eea054fd0e5c4c93fabb3 100644 (file)
--- a/loop.c
+++ b/loop.c
@@ -37,7 +37,11 @@ typedef struct loop_info struct_loop_info;
 #include MPERS_DEFS
 
 #include "print_fields.h"
-#include "xlat/loop_cmds.h"
+
+#define XLAT_MACROS_ONLY
+# include "xlat/loop_cmds.h"
+#undef XLAT_MACROS_ONLY
+
 #include "xlat/loop_flags_options.h"
 #include "xlat/loop_crypt_type_options.h"
 

diff --git a/tests/ioctl_loop.c b/tests/ioctl_loop.c
index 8c7e0cdc0f42a127464472f1a3a8b00ef0ec8005..10ae6167d4f73a586a6fb9c55aed0b0a3c11fafa 100644 (file)
--- a/tests/ioctl_loop.c
+++ b/tests/ioctl_loop.c
@@ -41,7 +41,10 @@
 #include <linux/ioctl.h>
 #include <linux/loop.h>
 #include "print_fields.h"
-#include "xlat/loop_cmds.h"
+
+#define XLAT_MACROS_ONLY
+# include "xlat/loop_cmds.h"
+#undef XLAT_MACROS_ONLY
 
 #ifndef ABBREV
 # define ABBREV 0

diff --git a/xlat/loop_cmds.in b/xlat/loop_cmds.in
index c4728af354307259a16ebe42c3971e45832c8e68..939fb4802ac54af6b0074940a71ed64ff84bc2db 100644 (file)
--- a/xlat/loop_cmds.in
+++ b/xlat/loop_cmds.in
@@ -11,4 +11,3 @@ LOOP_SET_BLOCK_SIZE   0x4C09
 LOOP_CTL_ADD           0x4C80
 LOOP_CTL_REMOVE                0x4C81
 LOOP_CTL_GET_FREE      0x4C82
-#stop