diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:22:07 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:57 +0000 |
| commit | 8761fdb52e725d81cca926454dae4a0e8e1fe1f5 (patch) | |
| tree | e0cdec5eebd87a78318180c9257a81673bd1181f /JavaScriptCore/wtf/ThreadingPthreads.cpp | |
| parent | 33fc8ca0ce504ea94c9b038e11968187fc10d13e (diff) | |
| download | external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.zip external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.tar.gz external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.tar.bz2 | |
Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROID
See http://trac.webkit.org/changeset/52791
Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8
Diffstat (limited to 'JavaScriptCore/wtf/ThreadingPthreads.cpp')
| -rw-r--r-- | JavaScriptCore/wtf/ThreadingPthreads.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/JavaScriptCore/wtf/ThreadingPthreads.cpp b/JavaScriptCore/wtf/ThreadingPthreads.cpp index e4fc0eb..5a7ff55 100644 --- a/JavaScriptCore/wtf/ThreadingPthreads.cpp +++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp @@ -47,13 +47,8 @@ #include <sys/time.h> #endif -<<<<<<< HEAD -#if PLATFORM(ANDROID) -#include "JNIUtility.h" -======= #if OS(ANDROID) -#include "jni_utility.h" ->>>>>>> webkit.org at r54127 +#include "JNIUtility.h" #endif namespace WTF { |