summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bogus/mach_assert.h5
-rw-r--r--ddb/tr.h7
-rw-r--r--i386/i386/loose_ends.c6
4 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 19c3702..e4cbd90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-10-09 Thomas Schwinge <tschwinge@gnu.org>
+ * ddb/tr.h: Insert the content of `bogus/mach_assert.h' instead of
+ including it.
+ * i386/i386/loose_ends.c: Likewise.
+ * bogus/mach_assert.h: Remove file.
+
* bogus/panic.c: Remove file.
* linux/src/drivers/scsi/in2000.c (in2000_proc_info) [PROC_INTERFACE]:
diff --git a/bogus/mach_assert.h b/bogus/mach_assert.h
deleted file mode 100644
index 2550197..0000000
--- a/bogus/mach_assert.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef NDEBUG
-#define MACH_ASSERT 1
-#else
-#define MACH_ASSERT 0
-#endif
diff --git a/ddb/tr.h b/ddb/tr.h
index 1d6145a..2d058ca 100644
--- a/ddb/tr.h
+++ b/ddb/tr.h
@@ -15,7 +15,12 @@
* less formatting.
*/
-#include <mach_assert.h>
+#ifndef NDEBUG
+#define MACH_ASSERT 1
+#else
+#define MACH_ASSERT 0
+#endif
+
#include <mach_tr.h>
/*
diff --git a/i386/i386/loose_ends.c b/i386/i386/loose_ends.c
index a5671af..43d3513 100644
--- a/i386/i386/loose_ends.c
+++ b/i386/i386/loose_ends.c
@@ -25,8 +25,12 @@
*/
/*
*/
-#include <mach_assert.h>
+#ifndef NDEBUG
+#define MACH_ASSERT 1
+#else
+#define MACH_ASSERT 0
+#endif
/*
* For now we will always go to single user mode, since there is