From e0b9f47ef2218dcefd5c53055cf3dd9fde6e4dff Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 13 Oct 2006 14:32:32 +0000 Subject: 2006-10-13 Thomas Schwinge * Makerules.in (ASFLAGS): Don't define `ASSEMBLER'. * i386/i386/cpu_number.h: Check for `__ASSEMBLER__' instead of `ASSEMBLER'. * i386/i386/debug.h: Likewise. * i386/i386/ipl.h: Likewise. * i386/i386/ldt.h: Likewise. * i386/i386/proc_reg.h: Likewise. * i386/i386/seg.h: Likewise. * i386/i386/trap.h: Likewise. * i386/include/mach/i386/kern_return.h: Likewise. * i386/include/mach/i386/vm_types.h: Likewise. * i386/intel/pmap.h: Likewise. * include/mach/boolean.h: Likewise. * include/mach/boot.h: Likewise. * include/mach/error.h: Likewise. * kern/syscall_emulation.h: Likewise. --- include/mach/boolean.h | 4 ++-- include/mach/boot.h | 4 ++-- include/mach/error.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/mach/boolean.h b/include/mach/boolean.h index 54028ad..f0f36a2 100644 --- a/include/mach/boolean.h +++ b/include/mach/boolean.h @@ -37,9 +37,9 @@ * Pick up "boolean_t" type definition */ -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ #include -#endif /* ASSEMBLER */ +#endif /* __ASSEMBLER__ */ #endif /* _MACH_BOOLEAN_H_ */ diff --git a/include/mach/boot.h b/include/mach/boot.h index 2f3e6c8..d3e141f 100644 --- a/include/mach/boot.h +++ b/include/mach/boot.h @@ -25,7 +25,7 @@ #include -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ #include @@ -65,7 +65,7 @@ struct boot_rendezvous int code; }; -#endif !ASSEMBLER +#endif !__ASSEMBLER__ /* This is the magic value that must appear in boot_module.magic. */ diff --git a/include/mach/error.h b/include/mach/error.h index 1aa6a84..72a2d79 100644 --- a/include/mach/error.h +++ b/include/mach/error.h @@ -87,9 +87,9 @@ /* Flux OS error systems */ #define err_fluke err_system(0x20) /* Fluke API */ -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ typedef kern_return_t mach_error_t; typedef mach_error_t (* mach_error_fn_t)(); -#endif /* ASSEMBLER */ +#endif /* __ASSEMBLER__ */ #endif /* _MACH_ERROR_H_ */ -- cgit v1.2.3