Macro smashing. Also sequester lower-case null to ntservice.cpp

2 files changed, 3 insertions, 3 deletions

diff --git a/db/db.cpp b/db/db.cpp
index f573c54cfd3..907553254c2 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -464,7 +464,7 @@ namespace mongo {
 
     Timer startupSrandTimer;
 
-    void _initAndListen(int listenPort, const char *appserverLoc = null) {
+    void _initAndListen(int listenPort, const char *appserverLoc = NULL) {
 
 #if !defined(_WIN32)
         pid_t pid = 0;
@@ -544,7 +544,7 @@ namespace mongo {
         while( 1 )
             sleepsecs( 100 );
     }
-    void initAndListen(int listenPort, const char *appserverLoc = null) {
+    void initAndListen(int listenPort, const char *appserverLoc = NULL) {
         try { _initAndListen(listenPort, appserverLoc); }
         catch ( std::exception &e ) {
             problem() << "exception in initAndListen std::exception: " << e.what() << ", terminating" << endl;
diff --git a/db/instance.cpp b/db/instance.cpp
index e74c6cf9d03..cb93a042933 100644
--- a/db/instance.cpp
+++ b/db/instance.cpp
@@ -57,7 +57,7 @@ namespace mongo {
 
     string bind_ip = "";
 
-    char *appsrvPath = null;
+    char *appsrvPath = NULL;
 
     DiagLog _diaglog;