summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/config.h1
-rw-r--r--src/core/config.c8
2 files changed, 9 insertions, 0 deletions
diff --git a/src/config.h b/src/config.h
index 7dfba144f..ac15f7794 100644
--- a/src/config.h
+++ b/src/config.h
@@ -124,5 +124,6 @@
* "make bin/rtl8139.dsk bs" */
#undef BUILD_ID /* Include a custom build ID string,
* e.g "test-foo" */
+#undef NULL_TRAP /* Attempt to catch NULL function calls */
/* @END general.h */
diff --git a/src/core/config.c b/src/core/config.c
index ce92d90a6..3a57ffd51 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -199,3 +199,11 @@ REQUIRE_OBJECT ( wince );
#ifdef PXE_IMAGE
REQUIRE_OBJECT ( pxe );
#endif
+
+/*
+ * Drag in miscellaneous objects
+ *
+ */
+#ifdef NULL_TRAP
+REQUIRE_OBJECT ( nulltrap );
+#endif