Add NULL_TRAP as a config option

diff --git a/src/config.h b/src/config.h
index 7dfba144f521abdfd71318a6fc29ba3fdb09243a..ac15f7794d270b92e744d1f77d9d4716d1bbe599 100644 (file)
--- 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 ce92d90a64de193b7a4595f6bf46ffec0de28857..3a57ffd51dc87ec06122b94be1e04390d1a2a89c 100644 (file)
--- 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