This was done some time ago, but apparently didn't make it to all files. This change picks up a few of the stragglers: the rest that remain seem to be mostly generated code.
Change-Id: I5d551efcd80513ffbe6a16dc89ed1e931312ac2e Signed-off-by: Dan Cross <[email protected]> --- kern/arch/x86/paging_tmpl.h | 2 ++ kern/include/arsc_server.h | 6 +++--- kern/include/ros/evbitmap.h | 7 ++----- kern/include/stdint.h | 2 ++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/kern/arch/x86/paging_tmpl.h b/kern/arch/x86/paging_tmpl.h index 6c4fd23..4bb1088 100644 --- a/kern/arch/x86/paging_tmpl.h +++ b/kern/arch/x86/paging_tmpl.h @@ -3,6 +3,8 @@ * so the code in this file is compiled twice, once per pte size. */ +#pragma once + #if PTTYPE == 64 #define pt_element_t uint64_t #define guest_walker guest_walker64 diff --git a/kern/include/arsc_server.h b/kern/include/arsc_server.h index 1f15f23..5a4de11 100644 --- a/kern/include/arsc_server.h +++ b/kern/include/arsc_server.h @@ -3,8 +3,9 @@ * See the COPYRIGHT files at the top of this source tree for full * license information. */ -#ifndef _ROS_ARSC_SERVER_H -#define __ROS_ARSC_SERVER_H + +#pragma once + #include <ros/common.h> #include <ros/ring_syscall.h> #include <arch/types.h> @@ -22,4 +23,3 @@ intreg_t syscall_async(struct proc* p, syscall_req_t *syscall); void arsc_server(uint32_t srcid, long a0, long a1, long a2); static intreg_t process_generic_syscalls(struct proc* p, size_t max); -#endif //ARSC_SERVER diff --git a/kern/include/ros/evbitmap.h b/kern/include/ros/evbitmap.h index 5ccc111..4451653 100644 --- a/kern/include/ros/evbitmap.h +++ b/kern/include/ros/evbitmap.h @@ -5,15 +5,12 @@ * Event bitmaps. These are a type of event mailbox where the message type is * translated to a bit, which is set in the bitmap. */ +#pragma once + /* Include this outside the ifndef, due to circular include concerns. */ #include <ros/event.h> -#ifndef ROS_INC_EVBITMAP_H -#define ROS_INC_EVBITMAP_H - struct evbitmap { bool check_bits; uint8_t bitmap[(MAX_NR_EVENT - 1) / 8 + 1]; }; - -#endif /* ROS_INC_EVBITMAP_H */ diff --git a/kern/include/stdint.h b/kern/include/stdint.h index 909c7b4..229d21f 100644 --- a/kern/include/stdint.h +++ b/kern/include/stdint.h @@ -1,3 +1,5 @@ +#pragma once + #include <arch/types.h> /* Limits of integral types. */ -- 2.8.0.rc3.226.g39d4020 -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
