commit f3831bf3d32a5a5246c0d850a4bb4ff806fec5e5 Author: Sebastian Hahn sebastian@torproject.org Date: Tue Feb 28 14:13:00 2012 +0100
Remove the qt-interlock patch
It hasn't been needed since qt 4.4.4 and we're way past that --- src/current-patches/qt/qt-interlock-fix.patch | 36 ------------------------- 1 files changed, 0 insertions(+), 36 deletions(-)
diff --git a/src/current-patches/qt/qt-interlock-fix.patch b/src/current-patches/qt/qt-interlock-fix.patch deleted file mode 100644 index 78464fc..0000000 --- a/src/current-patches/qt/qt-interlock-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- qatomic_windows.h-orig Wed Nov 26 14:36:33 2008 -+++ qatomic_windows.h Wed Nov 26 15:11:57 2008 -@@ -190,13 +190,32 @@ - - #if !(defined Q_CC_BOR) || (__BORLANDC__ < 0x560) - -+#if defined(Q_CC_GNU) -+#include <windows.h> -+#endif -+ -+#ifndef __INTERLOCKED_DECLARED -+ -+extern "C" { -+__declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long); -+__declspec(dllimport) long __stdcall InterlockedIncrement(long *); -+__declspec(dllimport) long __stdcall InterlockedDecrement(long *); -+__declspec(dllimport) long __stdcall InterlockedExchange(long *, long); -+__declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long); -+} -+ -+#endif -+/* - extern "C" { - __declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long); - __declspec(dllimport) long __stdcall InterlockedIncrement(long *); - __declspec(dllimport) long __stdcall InterlockedDecrement(long *); - __declspec(dllimport) long __stdcall InterlockedExchange(long *, long); - __declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long); --} -+} -+*/ -+ -+ - - #else -