diff options
author | Michael Brown | 2006-06-11 03:55:43 +0200 |
---|---|---|
committer | Michael Brown | 2006-06-11 03:55:43 +0200 |
commit | c10698b8b45cd3250d5cddaa60bd257514b72085 (patch) | |
tree | 48524c494e6e10cc1d974997e4fb4e7de7bfe2c2 | |
parent | Fix typo (diff) | |
download | ipxe-c10698b8b45cd3250d5cddaa60bd257514b72085.tar.gz ipxe-c10698b8b45cd3250d5cddaa60bd257514b72085.tar.xz ipxe-c10698b8b45cd3250d5cddaa60bd257514b72085.zip |
Add NULL_TRAP as a config option
-rw-r--r-- | src/config.h | 1 | ||||
-rw-r--r-- | src/core/config.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/config.h b/src/config.h index 7dfba144..ac15f779 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 ce92d90a..3a57ffd5 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 |