From f033a1da9f4c3acf7e3dfef906d01e348b6fcf42 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 9 Mar 2021 11:42:34 -0500
Subject: Restructure our includes.

This re-structures our includes so we can be sure everything is always
including all the system headers in a uniform, predictable way.

Temporarily it also adds a bunch of junk at all the places we use
variadic functions to specifically pick either the MS (cdecl) or ELF
ABIs.

I'm not 100% sure that's all correct (see later patch) but it's enough
to allow this to build.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 include/test.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/test.h')

diff --git a/include/test.h b/include/test.h
index 6fc178ba..8a970fd2 100644
--- a/include/test.h
+++ b/include/test.h
@@ -11,13 +11,13 @@
 #include <stdarg.h>
 
 #if defined(__aarch64__)
-#include <aa64/efibind.h>
+#include <aarch64/efibind.h>
 #elif defined(__arm__)
 #include <arm/efibind.h>
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
 #include <ia32/efibind.h>
 #elif defined(__x86_64__)
-#include <x64/efibind.h>
+#include <x86_64/efibind.h>
 #else
 #error what arch is this
 #endif
-- 
cgit v1.2.3