summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-04-24 16:06:44 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-05-03 15:21:27 (GMT)
commitf668407b30868ef137016b70011ce888e7950d4e (patch)
tree4ecd73ab32db7d5694b82c05ef1266e0f551190e
parent0ba35fd5a81df57fb0f943c3dddd35d43ebc3383 (diff)
downloadQt-f668407b30868ef137016b70011ce888e7950d4e.zip
Qt-f668407b30868ef137016b70011ce888e7950d4e.tar.gz
Qt-f668407b30868ef137016b70011ce888e7950d4e.tar.bz2
Fix atomics on SPARC
Inspired by https://bugreports.qt-project.org/secure/attachment/26020/qt_atomic_sparc64.patch Task-number: QTBUG-22479 Change-Id: Ie3275df96c639d6a75e05f70fe5745aeb34457f9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry-picked from commit 01ee0985319a0f41be12c3c8ff3813a74b43835e)
-rw-r--r--src/corelib/arch/qatomic_sparc.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/arch/qatomic_sparc.h b/src/corelib/arch/qatomic_sparc.h
index feb172e..e478765 100644
--- a/src/corelib/arch/qatomic_sparc.h
+++ b/src/corelib/arch/qatomic_sparc.h
@@ -127,17 +127,17 @@ extern "C" {
Q_CORE_EXPORT int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
Q_CORE_EXPORT int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
- Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval);
+ Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, const void *expected, const void *newval);
Q_CORE_EXPORT int q_atomic_test_and_set_acquire_ptr(volatile void *ptr,
- void *expected,
- void *newval);
+ const void *expected,
+ const void *newval);
Q_CORE_EXPORT int q_atomic_test_and_set_release_ptr(volatile void *ptr,
- void *expected,
- void *newval);
+ const void *expected,
+ const void *newval);
- Q_CORE_EXPORT void *q_atomic_set_ptr(volatile void *ptr, void *newval);
- Q_CORE_EXPORT void *q_atomic_fetch_and_store_acquire_ptr(volatile void *ptr, void *newval);
- Q_CORE_EXPORT void *q_atomic_fetch_and_store_release_ptr(volatile void *ptr, void *newval);
+ Q_CORE_EXPORT void *q_atomic_set_ptr(volatile void *ptr, const void *newval);
+ Q_CORE_EXPORT void *q_atomic_fetch_and_store_acquire_ptr(volatile void *ptr, const void *newval);
+ Q_CORE_EXPORT void *q_atomic_fetch_and_store_release_ptr(volatile void *ptr, const void *newval);
Q_CORE_EXPORT void *q_atomic_fetch_and_add_ptr(volatile void *ptr, int value);
Q_CORE_EXPORT void *q_atomic_fetch_and_add_acquire_ptr(volatile void *ptr, int value);