Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2541)

Unified Diff: Source/wtf/Assertions.cpp

Issue 23691071: OS(ANDROID) should not imply OS(LINUX) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Refactor OS macros to have exclusive priority order Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/linux/WebFontRendering.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/Assertions.cpp
diff --git a/Source/wtf/Assertions.cpp b/Source/wtf/Assertions.cpp
index 984b44db2e1e3a870447b3f78985e971ce71e8bd..10879d67092210c8ce82716506ce54b7a0eb5f98 100644
--- a/Source/wtf/Assertions.cpp
+++ b/Source/wtf/Assertions.cpp
@@ -63,7 +63,7 @@
#define HAVE_ISDEBUGGERPRESENT 1
#endif
-#if (OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -226,7 +226,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
void WTFGetBacktrace(void** stack, int* size)
{
-#if (OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
*size = backtrace(stack, *size);
#elif OS(WIN)
// The CaptureStackBackTrace function is available in XP, but it is not defined
@@ -265,7 +265,7 @@ void WTFPrintBacktrace(void** stack, int size)
for (int i = 0; i < size; ++i) {
const char* mangledName = 0;
char* cxaDemangled = 0;
-#if OS(MACOSX) || (OS(LINUX) && !OS(ANDROID))
+#if OS(MACOSX) || OS(LINUX)
Dl_info info;
if (dladdr(stack[i], &info) && info.dli_sname)
mangledName = info.dli_sname;
« no previous file with comments | « Source/web/linux/WebFontRendering.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698