util/grub-module-verifierXX: Enable running standalone checkers

Allow treating util/grub-module-verifierXX.c as a file you can build
directly so syntax checkers like vim's "syntastic" plugin, which uses
"gcc -x c -fsyntax-only" to build it, will work.

One still has to do whatever setup is required to make it pick the
right include dirs, which -I options we use, etc., but this makes
it so you can do the checking on the file you're editing, rather
than on a different file.

Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/include/grub/elf.h b/include/grub/elf.h
index 0e70651d4bae199fa061bd346350aed2d7c4ced9..e6f073bc90331cd4474aa38f2ce8223f8242ba19 100644 (file)
--- a/include/grub/elf.h
+++ b/include/grub/elf.h
@@ -2593,8 +2593,8 @@ typedef Elf64_Word Elf_Word;
 typedef Elf64_Xword Elf_Xword;
 typedef Elf64_Shnum Elf_Shnum;
 
-#define ELF_ST_BIND(val)       ELF64_ST_BIND (val)
-#define ELF_ST_TYPE(val)       ELF64_ST_TYPE (val)
+#define ELF_ST_BIND(val)       ELF64_ST_BIND(val)
+#define ELF_ST_TYPE(val)       ELF64_ST_TYPE(val)
 #define ELF_ST_INFO(a,b)       ELF64_ST_INFO(a,b)
 #define ELF_R_SYM(val)         ELF64_R_SYM(val)
 #define ELF_R_TYPE(val)                ELF64_R_TYPE(val)

diff --git a/util/grub-module-verifier32.c b/util/grub-module-verifier32.c
index 257229f8f08c632cbbbc0ba235495483b4fc5a50..ba7d41aafeaa1f2790f25a5fe62344d8dd1d5024 100644 (file)
--- a/util/grub-module-verifier32.c
+++ b/util/grub-module-verifier32.c
@@ -1,2 +1,4 @@
 #define MODULEVERIFIER_ELF32 1
+#ifndef GRUB_MODULE_VERIFIERXX
 #include "grub-module-verifierXX.c"
+#endif

diff --git a/util/grub-module-verifier64.c b/util/grub-module-verifier64.c
index 4db6b4bedd1e9a3e18537e045516326b1cf714aa..fc23ef800b35fc121f7150b03c0e741846cc029a 100644 (file)
--- a/util/grub-module-verifier64.c
+++ b/util/grub-module-verifier64.c
@@ -1,2 +1,4 @@
 #define MODULEVERIFIER_ELF64 1
+#ifndef GRUB_MODULE_VERIFIERXX
 #include "grub-module-verifierXX.c"
+#endif

diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c
index 8e0cd91d900564b0578e6a078254125493decb4e..d5907f268e29ead84f6d6b33c78d4aadfec51675 100644 (file)
--- a/util/grub-module-verifierXX.c
+++ b/util/grub-module-verifierXX.c
@@ -1,3 +1,12 @@
+#define GRUB_MODULE_VERIFIERXX
+#if !defined(MODULEVERIFIER_ELF32) && !defined(MODULEVERIFIER_ELF64)
+#if __SIZEOF_POINTER__ == 8
+#include "grub-module-verifier64.c"
+#else
+#include "grub-module-verifier32.c"
+#endif
+#endif
+
 #include <string.h>
 
 #include <grub/elf.h>