summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-10-13 14:32:32 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:26:45 +0200
commite0b9f47ef2218dcefd5c53055cf3dd9fde6e4dff (patch)
tree2dddde5a350fa8ee577f2b9ed2974d1385f2f719 /include
parent8a44559ad7b3248526707b4af9b04c160aed2d7b (diff)
2006-10-13 Thomas Schwinge <tschwinge@gnu.org>
* 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.
Diffstat (limited to 'include')
-rw-r--r--include/mach/boolean.h4
-rw-r--r--include/mach/boot.h4
-rw-r--r--include/mach/error.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/include/mach/boolean.h b/include/mach/boolean.h
index 54028ad7..f0f36a21 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 <mach/machine/boolean.h>
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* _MACH_BOOLEAN_H_ */
diff --git a/include/mach/boot.h b/include/mach/boot.h
index 2f3e6c80..d3e141fa 100644
--- a/include/mach/boot.h
+++ b/include/mach/boot.h
@@ -25,7 +25,7 @@
#include <mach/machine/boot.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#include <mach/machine/vm_types.h>
@@ -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 1aa6a841..72a2d79c 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_ */