diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2010-09-29 11:13:27 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-10-05 09:44:29 (GMT) |
| commit | faba550d704312a29d9485bcaaa506331f102301 (patch) | |
| tree | b821d7bfe9aa327a35cd877708dd99de082971a5 /src | |
| parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
| download | Qt-faba550d704312a29d9485bcaaa506331f102301.zip Qt-faba550d704312a29d9485bcaaa506331f102301.tar.gz Qt-faba550d704312a29d9485bcaaa506331f102301.tar.bz2 | |
Fixed arm X11 build.
Without we get error: invalid conversion from 'const void*' to 'void*'
Reviewed-by: Thiago Macieira
Diffstat (limited to 'src')
| -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)) |