From ec48a489bea01af4e70576e74250495a754a11b2 Mon Sep 17 00:00:00 2001
From: Braiden Vasco <braiden-vasco@users.noreply.github.com>
Date: Fri, 3 Nov 2017 01:59:18 +0000
Subject: [PATCH] Move "include/kernelmq/multiboot.h" to "arch/multiboot.h"

---
 Makefile                               | 2 +-
 arch/Makefile                          | 2 +-
 arch/main.c                            | 3 +--
 arch/multiboot.c                       | 2 +-
 {include/kernelmq => arch}/multiboot.h | 8 --------
 5 files changed, 4 insertions(+), 13 deletions(-)
 rename {include/kernelmq => arch}/multiboot.h (77%)

diff --git a/Makefile b/Makefile
index 9ce84ab..977701f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ all: all-kernel all-iso
 clean: clean-iso clean-kernel
 
 all-kernel:
-	make all -C arch I=$(shell pwd)/include
+	make all -C arch
 
 clean-kernel:
 	make clean -C arch
diff --git a/arch/Makefile b/arch/Makefile
index ef6792b..4489dc1 100644
--- a/arch/Makefile
+++ b/arch/Makefile
@@ -15,7 +15,7 @@ kernel: $(OBJS)
 	grub-file --is-x86-multiboot2 $@
 
 %.c.o: %.c
-	$(CC) -c $< -o $@ -std=gnu99 -ffreestanding -nostdinc -fno-builtin -fno-stack-protector -Wall -Wextra -I "$(I)"
+	$(CC) -c $< -o $@ -std=gnu99 -ffreestanding -nostdinc -fno-builtin -fno-stack-protector -Wall -Wextra
 
 %.s.o: %.s
 	$(AS) $< -o $@
diff --git a/arch/main.c b/arch/main.c
index 9a72b9f..e561c4e 100644
--- a/arch/main.c
+++ b/arch/main.c
@@ -1,5 +1,4 @@
-#include <kernelmq/multiboot.h>
-
+#include "multiboot.h"
 #include "logger.h"
 #include "protected.h"
 
diff --git a/arch/multiboot.c b/arch/multiboot.c
index 5446eed..71fde71 100644
--- a/arch/multiboot.c
+++ b/arch/multiboot.c
@@ -1,4 +1,4 @@
-#include <kernelmq/multiboot.h>
+#include "multiboot.h"
 
 #include "console.h"
 #include "util.h"
diff --git a/include/kernelmq/multiboot.h b/arch/multiboot.h
similarity index 77%
rename from include/kernelmq/multiboot.h
rename to arch/multiboot.h
index 770eff2..f7d494e 100644
--- a/include/kernelmq/multiboot.h
+++ b/arch/multiboot.h
@@ -1,10 +1,6 @@
 #ifndef KERNELMQ_INCLUDED_MULTIBOOT
 #define KERNELMQ_INCLUDED_MULTIBOOT 1
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct KernelMQ_Multiboot_Info {
     unsigned long magic;
     unsigned long addr;
@@ -12,8 +8,4 @@ struct KernelMQ_Multiboot_Info {
 
 void print_multiboot_info(struct KernelMQ_Multiboot_Info info);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif