diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 06:38:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 06:38:58 (GMT) |
| commit | 9754c200aa325614e05e6b00e3adedbdda1d161a (patch) | |
| tree | 9298314e82171bccdd6568c0385d238086e21cbc /src/corelib | |
| parent | eb126c11c72c82baf55f4b62e69cb138f4dce059 (diff) | |
| parent | f505196fdec6a0d855eb554a92f5e03b61df1e68 (diff) | |
| download | Qt-9754c200aa325614e05e6b00e3adedbdda1d161a.zip Qt-9754c200aa325614e05e6b00e3adedbdda1d161a.tar.gz Qt-9754c200aa325614e05e6b00e3adedbdda1d161a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Adding a threshold for partial updates.
Fixed arm X11 build.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/qatomic_arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h index 9df02a2..bca3375 100644 --- a/src/corelib/arch/qatomic_arm.h +++ b/src/corelib/arch/qatomic_arm.h @@ -107,7 +107,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() // kernel places a restartable cmpxchg implementation at a fixed address extern "C" typedef int (qt_atomic_eabi_cmpxchg_int_t)(int oldval, int newval, volatile int *ptr); -extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(void *oldval, void *newval, volatile void *ptr); +extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(const void *oldval, const void *newval, volatile void *ptr); #define qt_atomic_eabi_cmpxchg_int (*reinterpret_cast<qt_atomic_eabi_cmpxchg_int_t *>(0xffff0fc0)) #define qt_atomic_eabi_cmpxchg_ptr (*reinterpret_cast<qt_atomic_eabi_cmpxchg_ptr_t *>(0xffff0fc0)) |