Title: [116401] trunk/Source/WTF
- Revision
- 116401
- Author
- [email protected]
- Date
- 2012-05-08 00:34:08 -0700 (Tue, 08 May 2012)
Log Message
[Chromium] Assertions.cpp should work on OS(ANDROID)
https://bugs.webkit.org/show_bug.cgi?id=85867
Reviewed by Eric Seidel.
Some minor ifdefs for OS(ANDROID) on PLATFORM(CHROMIUM).
* wtf/Assertions.cpp:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (116400 => 116401)
--- trunk/Source/WTF/ChangeLog 2012-05-08 07:05:01 UTC (rev 116400)
+++ trunk/Source/WTF/ChangeLog 2012-05-08 07:34:08 UTC (rev 116401)
@@ -1,3 +1,14 @@
+2012-05-08 Adam Barth <[email protected]>
+
+ [Chromium] Assertions.cpp should work on OS(ANDROID)
+ https://bugs.webkit.org/show_bug.cgi?id=85867
+
+ Reviewed by Eric Seidel.
+
+ Some minor ifdefs for OS(ANDROID) on PLATFORM(CHROMIUM).
+
+ * wtf/Assertions.cpp:
+
2012-05-07 Adam Barth <[email protected]>
[Chromium] Android wishes to use an empty implementation if AXObjectCache
Modified: trunk/Source/WTF/wtf/Assertions.cpp (116400 => 116401)
--- trunk/Source/WTF/wtf/Assertions.cpp 2012-05-08 07:05:01 UTC (rev 116400)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2012-05-08 07:34:08 UTC (rev 116401)
@@ -52,7 +52,7 @@
#include <windows.h>
#endif
-#if OS(DARWIN) || OS(LINUX)
+#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -256,7 +256,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
-#if OS(DARWIN) || OS(LINUX)
+#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined
@@ -295,7 +295,7 @@
# if defined(__GLIBC__) && !defined(__UCLIBC__)
# define WTF_USE_BACKTRACE_SYMBOLS 1
# endif
-# else
+# elif !OS(ANDROID)
# define WTF_USE_DLADDR 1
# endif
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
