xnu-2782.1.97.tar.gz

[apple/xnu.git] / libkern / c++ / OSSymbol.cpp

diff --git a/libkern/c++/OSSymbol.cpp b/libkern/c++/OSSymbol.cpp
index c90107c1ba75293d7e9439512ba2056f5117ff37..b2f5f94bd283a7b3c19a85de63b225b9d8fb8e3c 100644 (file)
--- a/libkern/c++/OSSymbol.cpp
+++ b/libkern/c++/OSSymbol.cpp
@@ -30,9 +30,7 @@
 #include <string.h>
 #include <sys/cdefs.h>
 
-__BEGIN_DECLS
-#include <kern/lock.h>
-__END_DECLS
+#include <kern/locks.h>
 
 #include <libkern/c++/OSSymbol.h>
 #include <libkern/c++/OSLib.h>
@@ -465,7 +463,7 @@ void OSSymbol::initialize()
     pool = new OSSymbolPool;
     assert(pool);
 
-    if (!pool->init()) {
+    if (pool && !pool->init()) {
         delete pool;
         assert(false);
     };