Commit 647dba2f authored by Marko Novakovic's avatar Marko Novakovic Committed by Facebook Github Bot

Replacing instances of __CLANG__ with __clang__

Summary:
Clang compiler does not define `__CLANG__` macro and
only defines `__clang__`, but we use `__CLANG__` in a
few places in the code which was probably done by mistake.
This should make the code behave in the intended way.

Reviewed By: yfeldblum

Differential Revision: D5542162

fbshipit-source-id: 74d24ba9464d8faec160d73e6c582967d3c80c19
parent d0f5d850
...@@ -103,7 +103,7 @@ enum class Cmp : int { LT = -1, EQ = 0, GT = 1 }; ...@@ -103,7 +103,7 @@ enum class Cmp : int { LT = -1, EQ = 0, GT = 1 };
// Rather annoyingly, GCC's -Warray-bounds warning issues false positives for // Rather annoyingly, GCC's -Warray-bounds warning issues false positives for
// this code. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61971 // this code. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61971
#if defined(__GNUC__) && !defined(__CLANG__) && __GNUC__ <= 5 #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 5
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds" #pragma GCC diagnostic ignored "-Warray-bounds"
#endif #endif
...@@ -302,7 +302,7 @@ struct Helper { ...@@ -302,7 +302,7 @@ struct Helper {
} }
}; };
#if defined(__GNUC__) && !defined(__CLANG__) && __GNUC__ <= 4 #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 4
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <exception> #include <exception>
#if defined(__GNUG__) || defined(__CLANG__) #if defined(__GNUG__) || defined(__clang__)
#define FOLLY_EXCEPTION_COUNT_USE_CXA_GET_GLOBALS #define FOLLY_EXCEPTION_COUNT_USE_CXA_GET_GLOBALS
namespace __cxxabiv1 { namespace __cxxabiv1 {
// forward declaration (originally defined in unwind-cxx.h from from libstdc++) // forward declaration (originally defined in unwind-cxx.h from from libstdc++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment