SERVER-9563 Add support for config.h header

4 files changed, 45 insertions, 37 deletions

diff --git a/src/mongo/platform/backtrace.cpp b/src/mongo/platform/backtrace.cpp
index e8efed8191d..8ed3303decd 100644
--- a/src/mongo/platform/backtrace.cpp
+++ b/src/mongo/platform/backtrace.cpp
@@ -25,8 +25,10 @@
  *    then also delete it in the license file.
  */
 
+#include "mongo/config.h"
+
 #if !defined(_WIN32)
-#if defined(__sun) || !defined(MONGO_HAVE_EXECINFO_BACKTRACE)
+#if defined(__sun) || !defined(MONGO_CONFIG_HAVE_EXECINFO_BACKTRACE)
 
 #include "mongo/platform/backtrace.h"
 
diff --git a/src/mongo/platform/backtrace.h b/src/mongo/platform/backtrace.h
index ddb695b2ba8..be4dd033d30 100644
--- a/src/mongo/platform/backtrace.h
+++ b/src/mongo/platform/backtrace.h
@@ -27,8 +27,10 @@
 
 #pragma once
 
+#include "mongo/config.h"
+
 #if !defined(_WIN32)
-#if defined(__sun) || !defined(MONGO_HAVE_EXECINFO_BACKTRACE)
+#if defined(__sun) || !defined(MONGO_CONFIG_HAVE_EXECINFO_BACKTRACE)
 
 namespace mongo {
     namespace pal {
diff --git a/src/mongo/platform/endian.h b/src/mongo/platform/endian.h
index 8bccd2bb6c8..86a5e55b157 100644
--- a/src/mongo/platform/endian.h
+++ b/src/mongo/platform/endian.h
@@ -27,6 +27,8 @@
 
 #pragma once
 
+#include "mongo/config.h"
+
 #include <climits>
 #include <cstring>
 #include <boost/static_assert.hpp>
@@ -116,7 +118,7 @@
 # define MONGO_UINT64_SWAB(v) endian::bswap_slow64(v)
 #endif
 
-#if MONGO_BYTE_ORDER == MONGO_LITTLE_ENDIAN
+#if MONGO_CONFIG_BYTE_ORDER == MONGO_LITTLE_ENDIAN
 # define htobe16(v) MONGO_UINT16_SWAB(v)
 # define htobe32(v) MONGO_UINT32_SWAB(v)
 # define htobe64(v) MONGO_UINT64_SWAB(v)
@@ -129,7 +131,7 @@
 # define le16toh(v) (v)
 # define le32toh(v) (v)
 # define le64toh(v) (v)
-#elif MONGO_BYTE_ORDER == MONGO_BIG_ENDIAN
+#elif MONGO_CONFIG_BYTE_ORDER == MONGO_BIG_ENDIAN
 # define htobe16(v) (v)
 # define htobe32(v) (v)
 # define htobe64(v) (v)
@@ -144,7 +146,7 @@
 # define le64toh(v) MONGO_UINT64_SWAB(v)
 #else
 # error "The endianness of target architecture is unknown. " \
-        "Please define MONGO_BYTE_ORDER"
+        "Please define MONGO_CONFIG_BYTE_ORDER"
 #endif
 
 namespace mongo {
diff --git a/src/mongo/platform/endian_test.cpp b/src/mongo/platform/endian_test.cpp
index ab12b8c3fa3..ca6ae2a5ce4 100644
--- a/src/mongo/platform/endian_test.cpp
+++ b/src/mongo/platform/endian_test.cpp
@@ -25,6 +25,8 @@
  *    then also delete it in the license file.
  */
 
+#include "mongo/config.h"
+
 #include "mongo/platform/endian.h"
 
 #include <cstring>
@@ -79,7 +81,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(be, nativeToBig(le));
 #else
         ASSERT_EQUALS(be, nativeToBig(be));
@@ -94,7 +96,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(be, nativeToBig(le));
 #else
         ASSERT_EQUALS(be, nativeToBig(be));
@@ -109,7 +111,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(be, nativeToBig(le));
 #else
         ASSERT_EQUALS(be, nativeToBig(be));
@@ -124,7 +126,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(be, nativeToBig(le));
 #else
         ASSERT_EQUALS(be, nativeToBig(be));
@@ -139,7 +141,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(be, nativeToBig(le));
 #else
         ASSERT_EQUALS(be, nativeToBig(be));
@@ -154,7 +156,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(be, nativeToBig(le));
 #else
         ASSERT_EQUALS(be, nativeToBig(be));
@@ -169,7 +171,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(be, nativeToBig(le));
 #else
         ASSERT_EQUALS(be, nativeToBig(be));
@@ -184,7 +186,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(be, nativeToBig(le));
 #else
         ASSERT_EQUALS(be, nativeToBig(be));
@@ -199,7 +201,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, nativeToLittle(le));
 #else
         ASSERT_EQUALS(le, nativeToLittle(be));
@@ -214,7 +216,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, nativeToLittle(le));
 #else
         ASSERT_EQUALS(le, nativeToLittle(be));
@@ -229,7 +231,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, nativeToLittle(le));
 #else
         ASSERT_EQUALS(le, nativeToLittle(be));
@@ -244,7 +246,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, nativeToLittle(le));
 #else
         ASSERT_EQUALS(le, nativeToLittle(be));
@@ -259,7 +261,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, nativeToLittle(le));
 #else
         ASSERT_EQUALS(le, nativeToLittle(be));
@@ -274,7 +276,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, nativeToLittle(le));
 #else
         ASSERT_EQUALS(le, nativeToLittle(be));
@@ -289,7 +291,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, nativeToLittle(le));
 #else
         ASSERT_EQUALS(le, nativeToLittle(be));
@@ -304,7 +306,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, nativeToLittle(le));
 #else
         ASSERT_EQUALS(le, nativeToLittle(be));
@@ -319,7 +321,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, littleToNative(le));
 #else
         ASSERT_EQUALS(be, littleToNative(le));
@@ -334,7 +336,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, littleToNative(le));
 #else
         ASSERT_EQUALS(be, littleToNative(le));
@@ -349,7 +351,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, littleToNative(le));
 #else
         ASSERT_EQUALS(be, littleToNative(le));
@@ -364,7 +366,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, littleToNative(le));
 #else
         ASSERT_EQUALS(be, littleToNative(le));
@@ -379,7 +381,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, littleToNative(le));
 #else
         ASSERT_EQUALS(be, littleToNative(le));
@@ -394,7 +396,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, littleToNative(le));
 #else
         ASSERT_EQUALS(be, littleToNative(le));
@@ -409,7 +411,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, littleToNative(le));
 #else
         ASSERT_EQUALS(be, littleToNative(le));
@@ -424,7 +426,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, littleToNative(le));
 #else
         ASSERT_EQUALS(be, littleToNative(le));
@@ -439,7 +441,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, bigToNative(be));
 #else
         ASSERT_EQUALS(be, bigToNative(be));
@@ -454,7 +456,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, bigToNative(be));
 #else
         ASSERT_EQUALS(be, bigToNative(be));
@@ -469,7 +471,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, bigToNative(be));
 #else
         ASSERT_EQUALS(be, bigToNative(be));
@@ -484,7 +486,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, bigToNative(be));
 #else
         ASSERT_EQUALS(be, bigToNative(be));
@@ -499,7 +501,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, bigToNative(be));
 #else
         ASSERT_EQUALS(be, bigToNative(be));
@@ -514,7 +516,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, bigToNative(be));
 #else
         ASSERT_EQUALS(be, bigToNative(be));
@@ -529,7 +531,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, bigToNative(be));
 #else
         ASSERT_EQUALS(be, bigToNative(be));
@@ -544,7 +546,7 @@ namespace mongo {
         std::memcpy(&le, le_buf, sizeof(le));
         std::memcpy(&be, be_buf, sizeof(be));
 
-#if MONGO_BYTE_ORDER == 1234
+#if MONGO_CONFIG_BYTE_ORDER == 1234
         ASSERT_EQUALS(le, bigToNative(be));
 #else
         ASSERT_EQUALS(be, bigToNative(be));