From 4feefda8d050632a9799626d4ad5ddb8a778675d Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 15 Feb 2013 02:30:10 +1000
Subject: [PATCH] Symbian build fix: use glib for atomics.

---
 Common/Atomic_GCC.h | 4 ++++
 Qt/Settings.pri     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Common/Atomic_GCC.h b/Common/Atomic_GCC.h
index c6f508cc3d..2ee4622da1 100644
--- a/Common/Atomic_GCC.h
+++ b/Common/Atomic_GCC.h
@@ -20,6 +20,8 @@
 
 #ifdef BLACKBERRY
 #include <atomic.h>
+#elif defined(__SYMBIAN32__)
+#include <glib/gatomic.h>
 #endif
 
 #include "Common.h"
@@ -79,6 +81,8 @@ inline void AtomicStore(volatile u32& dest, u32 value) {
 inline void AtomicStoreRelease(volatile u32& dest, u32 value) {
 #ifdef BLACKBERRY
 	atomic_set(&dest, value);
+#elif defined(__SYMBIAN32__)
+    g_atomic_int_set(&dest, value);
 #else
 	__sync_lock_test_and_set(&dest, value); // TODO: Wrong! This function is has acquire semantics.
 #endif
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index f6f24b6c87..953e138ec3 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -42,6 +42,7 @@ symbian: {
 	MMP_RULES -= "ARMFPU softvfp+vfpv2"
 	MMP_RULES += "ARMFPU vfpv2"
 	QMAKE_CXXFLAGS += -marm -Wno-parentheses -Wno-comment
+	INCLUDEPATH += $$EPOCROOT/epoc32/include/stdapis/glib-2.0
 	DEFINES += __MARM_ARMV6__
 	CONFIG += 4.6.3
 }