summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-11-23 06:50:51 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-11-23 06:50:51 -0800
commitf49be335d71adf2b6d0e2dfa55d13b56376a62a8 (patch)
treee3021a80b780aeef386ae4c3e7899046b64f9f7b
parent4ceb72860b5e5d1431e3a528e70b49d4358fecdb (diff)
parent12c9767a8bbb805d040cc5027de1480d7f76f836 (diff)
downloadexternal_webkit-f49be335d71adf2b6d0e2dfa55d13b56376a62a8.zip
external_webkit-f49be335d71adf2b6d0e2dfa55d13b56376a62a8.tar.gz
external_webkit-f49be335d71adf2b6d0e2dfa55d13b56376a62a8.tar.bz2
Merge change I7f9c0552 into eclair-mr2
* changes: Updates Threading.h to reflect final version of Android atomicIncrement/Decrement submitted to webkit.org.
-rw-r--r--JavaScriptCore/wtf/Threading.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaScriptCore/wtf/Threading.h b/JavaScriptCore/wtf/Threading.h
index b161e77..b24e7c8 100644
--- a/JavaScriptCore/wtf/Threading.h
+++ b/JavaScriptCore/wtf/Threading.h
@@ -74,7 +74,7 @@
#elif PLATFORM(DARWIN)
#include <libkern/OSAtomic.h>
#elif PLATFORM(ANDROID)
-#include "cutils/atomic.h"
+#include <cutils/atomic.h>
#elif COMPILER(GCC)
#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
#include <ext/atomicity.h>