From: Sascha Wildner <saw@online.de>
Date: Mon, 30 Dec 2019 09:39:46 +0000 (+0100)
Subject: boot/loader: Fix -Wundef warnings in the legacy and UEFI loaders.
X-Git-Tag: v5.8.0rc1~182
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/abb58eb7e25d072a9189e7d8f06b669b8dcb083a

boot/loader: Fix -Wundef warnings in the legacy and UEFI loaders.

With the previous commit in acdragonfly.h, we can now normally
include acpi.h.
---

diff --git a/sys/boot/efi/loader/arch/x86_64/elf64_freebsd.c b/sys/boot/efi/loader/arch/x86_64/elf64_freebsd.c
index e408705854..a94062209f 100644
--- a/sys/boot/efi/loader/arch/x86_64/elf64_freebsd.c
+++ b/sys/boot/efi/loader/arch/x86_64/elf64_freebsd.c
@@ -23,11 +23,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c 293724 2016-01-12 02:17:39Z smh $
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c 293724 2016-01-12 02:17:39Z smh $");
-
 #define __ELF_WORD_SIZE 64
 #include <sys/param.h>
 #include <sys/exec.h>
@@ -41,11 +40,7 @@ __FBSDID("$FreeBSD: head/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c 293724 2
 
 #include "bootstrap.h"
 
-#include "platform/acdragonfly.h"
-#include "acconfig.h"
-#define ACPI_SYSTEM_XFACE
-#include "actypes.h"
-#include "actbl.h"
+#include "acpi.h"
 
 #include "loader_efi.h"
 
diff --git a/sys/boot/pc32/libi386/biosacpi.c b/sys/boot/pc32/libi386/biosacpi.c
index 90f9b1e9a5..f160490961 100644
--- a/sys/boot/pc32/libi386/biosacpi.c
+++ b/sys/boot/pc32/libi386/biosacpi.c
@@ -32,11 +32,7 @@
 #include <btxv86.h>
 #include "libi386.h"
 
-#include "platform/acdragonfly.h"
-#include "acconfig.h"
-#define ACPI_SYSTEM_XFACE
-#include "actypes.h"
-#include "actbl.h"
+#include "acpi.h"
 
 /*
  * Detect ACPI and export information about the ACPI BIOS into the