diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 13:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:59 +0100 |
| commit | 3f252f84468859d129a8c6a9302412d2e6e5a3fa (patch) | |
| tree | 109b326a088d13e83fd53b4bace151f800647c1a /JavaScriptCore | |
| parent | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (diff) | |
| download | external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.zip external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.gz external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.bz2 | |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 42 | ||||
| -rw-r--r-- | JavaScriptCore/wtf/Threading.h | 4 |
2 files changed, 12 insertions, 34 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 0f97bfe..75a0bc4 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -259,34 +259,21 @@ #if defined(__ARMEB__) #define WTF_PLATFORM_BIG_ENDIAN 1 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h -#elif !defined(__ARM_EABI__) && !defined(__EABI__) && !defined(__VFP_FP__) -#if !defined(ANDROID) -======= #elif !defined(__ARM_EABI__) \ && !defined(__EABI__) \ && !defined(__VFP_FP__) ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h +#if !defined(ANDROID) #define WTF_PLATFORM_MIDDLE_ENDIAN 1 #endif -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h #endif -#if !defined(__ARM_EABI__) && !defined(__EABI__) -#define WTF_PLATFORM_FORCE_PACK 1 -#endif -#define ARM_ARCH_VERSION 3 -#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) -#undef ARM_ARCH_VERSION -======= /* Set ARM_ARCH_VERSION */ #if defined(__ARM_ARCH_4__) \ || defined(__ARM_ARCH_4T__) \ || defined(__MARM_ARMV4__) \ || defined(_ARMV4I_) ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h #define ARM_ARCH_VERSION 4 #elif defined(__ARM_ARCH_5__) \ @@ -517,12 +504,8 @@ #endif #define HAVE_READLINE 1 #define HAVE_RUNLOOP_TIMER 1 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h #define HAVE_PTHREAD_RWLOCK 1 -#endif -======= #endif /* PLATFORM(MAC) && !PLATFORM(IPHONE) */ ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h #if PLATFORM(CHROMIUM) && PLATFORM(DARWIN) #define WTF_PLATFORM_CF 1 @@ -577,12 +560,9 @@ #define HAVE_SIGNAL_H 1 #endif -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h -#if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) && !PLATFORM(ANDROID) -======= #if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(QNX) \ - && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT) ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h + && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT) \ + && !PLATFORM(ANDROID) #define HAVE_TM_GMTOFF 1 #define HAVE_TM_ZONE 1 #define HAVE_TIMEGM 1 @@ -633,17 +613,19 @@ #define HAVE_SYS_PARAM_H 1 #endif -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h -#elif PLATFORM(ANDROID) -======= #elif PLATFORM(QNX) ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h #define HAVE_ERRNO_H 1 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h +#define HAVE_MMAP 1 +#define HAVE_SBRK 1 +#define HAVE_STRINGS_H 1 +#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_TIME_H 1 + +#elif PLATFORM(ANDROID) + +#define HAVE_ERRNO_H 1 #define HAVE_LANGINFO_H 0 -======= ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h #define HAVE_MMAP 1 #define HAVE_SBRK 1 #define HAVE_STRINGS_H 1 diff --git a/JavaScriptCore/wtf/Threading.h b/JavaScriptCore/wtf/Threading.h index e4a0b05..34d744d 100644 --- a/JavaScriptCore/wtf/Threading.h +++ b/JavaScriptCore/wtf/Threading.h @@ -234,16 +234,12 @@ inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(r inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); } inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); } -<<<<<<< HEAD:JavaScriptCore/wtf/Threading.h #elif defined ANDROID inline void atomicIncrement(int volatile* addend) { android_atomic_inc(addend); } inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); } -#elif COMPILER(GCC) -======= #elif COMPILER(GCC) && !PLATFORM(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Threading.h #define WTF_USE_LOCKFREE_THREADSAFESHARED 1 inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; } |