SERVER-9563 Add support for config.h header

2 files changed, 5 insertions, 17 deletions

diff --git a/src/mongo/shell/shell_options.cpp b/src/mongo/shell/shell_options.cpp
index 979e5cc8625..65f26fe7182 100644
--- a/src/mongo/shell/shell_options.cpp
+++ b/src/mongo/shell/shell_options.cpp
@@ -26,6 +26,8 @@
  *    then also delete it in the license file.
  */
 
+#include "mongo/config.h"
+
 #include "mongo/shell/shell_options.h"
 
 #include <boost/filesystem/operations.hpp>
@@ -107,7 +109,7 @@ namespace mongo {
                 "enable IPv6 support (disabled by default)");
 
         Status ret = Status::OK();
-#ifdef MONGO_SSL
+#ifdef MONGO_CONFIG_SSL
         ret = addSSLClientOptions(options);
         if (!ret.isOK()) {
             return ret;
@@ -184,7 +186,7 @@ namespace mongo {
         if (params.count("quiet")) {
             mongo::serverGlobalParams.quiet = true;
         }
-#ifdef MONGO_SSL
+#ifdef MONGO_CONFIG_SSL
         Status ret = storeSSLClientOptions(params);
         if (!ret.isOK()) {
             return ret;
@@ -313,7 +315,7 @@ namespace mongo {
     }
 
     Status validateMongoShellOptions(const moe::Environment& params) {
-#ifdef MONGO_SSL
+#ifdef MONGO_CONFIG_SSL
         Status ret = validateSSLMongoShellOptions(params);
         if (!ret.isOK()) {
             return ret;
diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
index ce5b22f9509..395db18d5e4 100644
--- a/src/mongo/shell/shell_utils_launcher.cpp
+++ b/src/mongo/shell/shell_utils_launcher.cpp
@@ -456,8 +456,6 @@ namespace mongo {
             env[0] = NULL;
             env[1] = NULL;
 
-            bool isMongos = ( _argv[0].find( "mongos" ) != string::npos );
-
             pid_t nativePid = fork();
             _pid = ProcessId::fromNative(nativePid);
             // Async signal unsafe functions should not be called in the child process.
@@ -474,18 +472,6 @@ namespace mongo {
                     quickExit(-1); //do not pass go, do not call atexit handlers
                 }
 
-                // Heap-check for mongos only. 'argv[0]' must be in the path format.
-                if ( isMongos ) {
-#if defined(HEAP_CHECKING)
-                    env[0] = "HEAPCHECK=normal";
-                    env[1] = NULL;
-
-                    // NOTE execve is async signal safe, but it is not clear that execvpe is async
-                    // signal safe.
-                    execvpe( argv[ 0 ], const_cast<char**>(argv) , const_cast<char**>(env) );
-#endif // HEAP_CHECKING
-                }
-
                 // NOTE execve is async signal safe, but it is not clear that execvp is async
                 // signal safe.
                 execvp( argv[ 0 ], const_cast<char**>(argv) );