SERVER-17552 Use correct OS detection macros, rather than our own

7 files changed, 17 insertions, 17 deletions

diff --git a/src/mongo/platform/backtrace.cpp b/src/mongo/platform/backtrace.cpp
index 431a9bf1bd9..e8efed8191d 100644
--- a/src/mongo/platform/backtrace.cpp
+++ b/src/mongo/platform/backtrace.cpp
@@ -26,7 +26,7 @@
  */
 
 #if !defined(_WIN32)
-#if defined(__sunos__) || !defined(MONGO_HAVE_EXECINFO_BACKTRACE)
+#if defined(__sun) || !defined(MONGO_HAVE_EXECINFO_BACKTRACE)
 
 #include "mongo/platform/backtrace.h"
 
@@ -223,5 +223,5 @@ namespace {
 
 } // namespace mongo
 
-#endif // #if defined(__sunos__)
+#endif // #if defined(__sun)
 #endif // #if !defined(_WIN32)
diff --git a/src/mongo/platform/backtrace.h b/src/mongo/platform/backtrace.h
index fd29622982f..ddb695b2ba8 100644
--- a/src/mongo/platform/backtrace.h
+++ b/src/mongo/platform/backtrace.h
@@ -28,7 +28,7 @@
 #pragma once
 
 #if !defined(_WIN32)
-#if defined(__sunos__) || !defined(MONGO_HAVE_EXECINFO_BACKTRACE)
+#if defined(__sun) || !defined(MONGO_HAVE_EXECINFO_BACKTRACE)
 
 namespace mongo {
     namespace pal {
diff --git a/src/mongo/platform/posix_fadvise.cpp b/src/mongo/platform/posix_fadvise.cpp
index 11079eb8fb8..b7787c55b0a 100644
--- a/src/mongo/platform/posix_fadvise.cpp
+++ b/src/mongo/platform/posix_fadvise.cpp
@@ -25,7 +25,7 @@
  *    then also delete it in the license file.
  */
 
-#if defined(__sunos__)
+#if defined(__sun)
 
 #include "mongo/platform/posix_fadvise.h"
 
@@ -65,4 +65,4 @@ namespace pal {
 
 } // namespace mongo
 
-#endif // #if defined(__sunos__)
+#endif // #if defined(__sun)
diff --git a/src/mongo/platform/posix_fadvise.h b/src/mongo/platform/posix_fadvise.h
index c266562541c..dc0a539c6c9 100644
--- a/src/mongo/platform/posix_fadvise.h
+++ b/src/mongo/platform/posix_fadvise.h
@@ -31,7 +31,7 @@
 
 #include <fcntl.h>
 
-#if defined(__sunos__)
+#if defined(__sun)
 
 #include <sys/types.h>
 
diff --git a/src/mongo/platform/random.cpp b/src/mongo/platform/random.cpp
index e00fab107ca..dcbd6f66ffc 100644
--- a/src/mongo/platform/random.cpp
+++ b/src/mongo/platform/random.cpp
@@ -117,7 +117,7 @@ namespace mongo {
         return new WinSecureRandom();
     }
 
-#elif defined(__linux__) || defined(__sunos__) || defined(__APPLE__) || defined(__freebsd__)
+#elif defined(__linux__) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__)
 
     class InputStreamSecureRandom : public SecureRandom {
     public:
@@ -150,7 +150,7 @@ namespace mongo {
         return new InputStreamSecureRandom( "/dev/urandom" );
     }
 
-#elif defined(__openbsd__)
+#elif defined(__OpenBSD__)
 
     class Arc4SecureRandom : public SecureRandom {
     public:
diff --git a/src/mongo/platform/strcasestr.cpp b/src/mongo/platform/strcasestr.cpp
index 7de541d5a03..2f91386b8e5 100644
--- a/src/mongo/platform/strcasestr.cpp
+++ b/src/mongo/platform/strcasestr.cpp
@@ -27,21 +27,21 @@
 
 #include "mongo/platform/strcasestr.h"
 
-#if defined(__sunos__)
+#if defined(__sun)
 #include <dlfcn.h>
 
 #include "mongo/base/init.h"
 #include "mongo/base/status.h"
 #endif
 
-#if defined(_WIN32) || defined(__sunos__)
+#if defined(_WIN32) || defined(__sun)
 
 #include <algorithm>
 #include <cctype>
 #include <cstring>
 #include <string>
 
-#if defined(__sunos__)
+#if defined(__sun)
 #define STRCASESTR_EMULATION_NAME strcasestr_emulation
 #else
 #define STRCASESTR_EMULATION_NAME strcasestr
@@ -79,7 +79,7 @@ namespace pal {
         return location ? (haystack + (location - haystackLowerStart)) : NULL;
     }
 
-#if defined(__sunos__)
+#if defined(__sun)
 
     typedef const char* (*StrCaseStrFunc)(const char* haystack, const char* needle);
     static StrCaseStrFunc strcasestr_switcher = mongo::pal::strcasestr_emulation;
@@ -88,14 +88,14 @@ namespace pal {
         return strcasestr_switcher(haystack, needle);
     }
 
-#endif // #if defined(__sunos__)
+#endif // #if defined(__sun)
 
 } // namespace pal
 } // namespace mongo
 
-#endif // #if defined(_WIN32) || defined(__sunos__)
+#endif // #if defined(_WIN32) || defined(__sun)
 
-#if defined(__sunos__)
+#if defined(__sun)
 
 namespace mongo {
 
@@ -114,4 +114,4 @@ namespace mongo {
 
 } // namespace mongo
 
-#endif // __sunos__
+#endif // __sun
diff --git a/src/mongo/platform/strcasestr.h b/src/mongo/platform/strcasestr.h
index 7ce2b1b3653..cdc2564c21e 100644
--- a/src/mongo/platform/strcasestr.h
+++ b/src/mongo/platform/strcasestr.h
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#if defined(_WIN32) || defined(__sunos__)
+#if defined(_WIN32) || defined(__sun)
 
 namespace mongo {
 namespace pal {