diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-07 14:12:39 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-07 14:12:39 (GMT) |
| commit | 91efdcaed6fe9e931b049460d9a177a4c4e5ac3e (patch) | |
| tree | c48f82df7c4623507f2cc29c5ed9006ffe5ad33c | |
| parent | 5f8ef6ac44e1db842003deeed6525eea70d8d83d (diff) | |
| download | Qt-91efdcaed6fe9e931b049460d9a177a4c4e5ac3e.zip Qt-91efdcaed6fe9e931b049460d9a177a4c4e5ac3e.tar.gz Qt-91efdcaed6fe9e931b049460d9a177a4c4e5ac3e.tar.bz2 | |
Merge faba550d704312a29d9485bcaaa506331f102301 from 4.7 to master.
The file had been renamed so git did not merge it properly
| -rw-r--r-- | src/corelib/arch/qatomic_armv5.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h index ab48380..f0f2f9a 100644 --- a/src/corelib/arch/qatomic_armv5.h +++ b/src/corelib/arch/qatomic_armv5.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, 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)) |