Commit 3e6dc6c2 by triazo

Remove C++ checks from kernel main file

parent b9a2b8b0
Showing with 1 additions and 14 deletions
#if !defined(__cplusplus)
#include <stdbool.h> /* C doesn't have booleans by default. */ #include <stdbool.h> /* C doesn't have booleans by default. */
#endif
#include <stddef.h> #include <stddef.h>
/* Check if the compiler thinks we are targeting the wrong operating system. */
#if defined(__linux__)
#error "You are not using a cross-compiler, you will most certainly run into trouble"
#endif
/* This tutorial will only work for the 32-bit ix86 targets. */
#if !defined(__i386__)
#error "This tutorial needs to be compiled with a ix86-elf compiler"
#endif
#include <stdint.h> #include <stdint.h>
#include "serial.h" #include "serial.h"
...@@ -37,7 +24,7 @@ void kernel_main() { ...@@ -37,7 +24,7 @@ void kernel_main() {
// Enable paging of memory. For now there is only one virtual // Enable paging of memory. For now there is only one virtual
// memory space defined by page_dir // memory space defined by page_dir
uint32_t* page_dir; page_directory_entry* page_dir;
page_dir = initiate_directory(); page_dir = initiate_directory();
initiate_page_table(page_dir); initiate_page_table(page_dir);
loadPageDirectory(page_dir); loadPageDirectory(page_dir);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment