From 946deda4b35a87c9db66de8a7017baa7e33dee41 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Tue, 24 Jun 2014 08:28:20 +1000
Subject: [PATCH] Remove some redundancy (Symbian/Qt). Symbian has cstdint now.

---
 Common/Atomic_GCC.h | 2 +-
 Qt/PPSSPP.pro       | 5 ++---
 ext/xbrz/xbrz.h     | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Common/Atomic_GCC.h b/Common/Atomic_GCC.h
index 5024b759bc..f5dc45a017 100644
--- a/Common/Atomic_GCC.h
+++ b/Common/Atomic_GCC.h
@@ -86,7 +86,7 @@ inline void AtomicStoreRelease(volatile u32& dest, u32 value) {
 #ifdef BLACKBERRY
 	atomic_set(&dest, value);
 #elif defined(__SYMBIAN32__)
-    __e32_atomic_store_rel32(&dest, value);
+	__e32_atomic_store_rel32(&dest, value);
 #else
 	__sync_lock_test_and_set(&dest, value); // TODO: Wrong! This function has acquire semantics.
 #endif
diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 37d28962b5..4d0d023512 100644
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -48,8 +48,7 @@ contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresampl
 
 win32 {
 	#Use a fixed base-address under windows
-	QMAKE_LFLAGS += /FIXED /BASE:"0x00400000"
-	QMAKE_LFLAGS += /DYNAMICBASE:NO
+	QMAKE_LFLAGS += /FIXED /BASE:"0x00400000" /DYNAMICBASE:NO
 	LIBS += -lwinmm -lws2_32 -lShell32 -lAdvapi32
 	contains(QMAKE_TARGET.arch, x86_64): LIBS += $$files($$P/dx9sdk/Lib/x64/*.lib)
 	else: LIBS += $$files($$P/dx9sdk/Lib/x86/*.lib)
@@ -69,7 +68,7 @@ macx|linux {
 		}
 	}
 }
-linux:!android: LIBS += -ldl -lrt -lz
+linux:!android: LIBS += -ldl -lrt
 macx: LIBS += -liconv
 qnx: LIBS += -lscreen
 symbian: LIBS += -lremconcoreapi -lremconinterfacebase
diff --git a/ext/xbrz/xbrz.h b/ext/xbrz/xbrz.h
index 23e6caab2a..81e88a2fbb 100644
--- a/ext/xbrz/xbrz.h
+++ b/ext/xbrz/xbrz.h
@@ -20,9 +20,7 @@
 #undef max
 
 #include <cstddef> //size_t
-#ifdef __SYMBIAN32__
-#include <boost/cstdint.hpp>
-#elif defined(IOS)
+#if defined(IOS)
 #include <stdint.h>
 #else
 #include <cstdint> //uint32_t