From b4d2f3a8e77bc27a7289e6620571f65f6ff75d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 7 Oct 2003 23:34:59 +0000 Subject: [PATCH] Renamed arch_stage2.h to arch_kernel_args.h. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4972 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../arch/ppc/{arch_stage2.h => arch_kernel_args.h} | 10 +++++++--- .../arch/x86/{arch_stage2.h => arch_kernel_args.h} | 10 ++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) rename headers/private/kernel/arch/ppc/{arch_stage2.h => arch_kernel_args.h} (67%) rename headers/private/kernel/arch/x86/{arch_stage2.h => arch_kernel_args.h} (78%) diff --git a/headers/private/kernel/arch/ppc/arch_stage2.h b/headers/private/kernel/arch/ppc/arch_kernel_args.h similarity index 67% rename from headers/private/kernel/arch/ppc/arch_stage2.h rename to headers/private/kernel/arch/ppc/arch_kernel_args.h index af19acee6d..44725c0603 100644 --- a/headers/private/kernel/arch/ppc/arch_stage2.h +++ b/headers/private/kernel/arch/ppc/arch_kernel_args.h @@ -2,8 +2,12 @@ ** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. ** Distributed under the terms of the OpenBeOS License. */ -#ifndef _KERNEL_ARCH_PPC_STAGE2_H -#define _KERNEL_ARCH_PPC_STAGE2_H +#ifndef KERNEL_ARCH_PPC_KERNEL_ARGS_H +#define KERNEL_ARCH_PPC_KERNEL_ARGS_H + +#ifndef KERNEL_BOOT_KERNEL_ARGS_H +# error This file is included from only +#endif #define _PACKED __attribute__((packed)) @@ -15,4 +19,4 @@ typedef struct { int screen_x, screen_y, screen_depth; } arch_kernel_args; -#endif /* _KERNEL_ARCH_PPC_STAGE2_H */ +#endif /* KERNEL_ARCH_PPC_KERNEL_ARGS_H */ diff --git a/headers/private/kernel/arch/x86/arch_stage2.h b/headers/private/kernel/arch/x86/arch_kernel_args.h similarity index 78% rename from headers/private/kernel/arch/x86/arch_stage2.h rename to headers/private/kernel/arch/x86/arch_kernel_args.h index 1d65f16f64..06dbaef8fd 100644 --- a/headers/private/kernel/arch/x86/arch_stage2.h +++ b/headers/private/kernel/arch/x86/arch_kernel_args.h @@ -2,10 +2,12 @@ ** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. ** Distributed under the terms of the NewOS License. */ -#ifndef _KERNEL_ARCH_x86_STAGE2_H -#define _KERNEL_ARCH_x86_STAGE2_H +#ifndef KERNEL_ARCH_x86_KERNEL_ARGS_H +#define KERNEL_ARCH_x86_KERNEL_ARGS_H -#include +#ifndef KERNEL_BOOT_KERNEL_ARGS_H +# error This file is included from only +#endif #define MAX_BOOT_PTABLES 4 @@ -38,4 +40,4 @@ typedef struct { uint32 cpu_apic_version[MAX_BOOT_CPUS]; } arch_kernel_args; -#endif /* _KERNEL_ARCH_x86_STAGE2_H */ +#endif /* KERNEL_ARCH_x86_KERNEL_ARGS_H */