From cf5956dcd3f7e1138bb0ec9f780b1accabc8f2b0 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sun, 27 Mar 2022 09:45:09 -0400 Subject: [PATCH] Rename Header to HulkHeader --- src/hello/hello.d | 2 +- src/hulk/header.d | 2 +- src/hulk/hulk.d | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hello/hello.d b/src/hello/hello.d index a1e2f99..a840a63 100644 --- a/src/hello/hello.d +++ b/src/hello/hello.d @@ -7,7 +7,7 @@ import uefi; import console = hello.console; import scratch = hello.scratch; import hulk.bootinfo; -import hulk.header : HulkHeader = Header; +import hulk.header; import hos.page_table; import hos.cpu; import hos.memory; diff --git a/src/hulk/header.d b/src/hulk/header.d index 639270d..341a262 100644 --- a/src/hulk/header.d +++ b/src/hulk/header.d @@ -6,7 +6,7 @@ module hulk.header; /** * Header describing the HULK image. */ -struct Header +struct HulkHeader { /** * Total size of memory to be mapped. diff --git a/src/hulk/hulk.d b/src/hulk/hulk.d index 947edc7..d679077 100644 --- a/src/hulk/hulk.d +++ b/src/hulk/hulk.d @@ -16,7 +16,7 @@ import hulk.hurl; extern extern(C) __gshared ubyte _hulk_total_size; @(ldc.attributes.section(".hulk_header")) -private __gshared Header hulk_header = { +private __gshared HulkHeader hulk_header = { &_hulk_total_size, /* total_size */ &hulk_start, /* entry */ 16u * 1024u, /* stack_size */