From fa4622c47d6aa2cc0356cf6f643e350bcc7a9113 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 1 Sep 2014 13:28:07 -0500 Subject: cygwin-w32api-headers 3.2.0 --- cygwin-w32api-headers.spec | 9 +-- mingw-w64-3.1.0-cygwin64.patch | 151 ----------------------------------------- 2 files changed, 5 insertions(+), 155 deletions(-) delete mode 100644 mingw-w64-3.1.0-cygwin64.patch diff --git a/cygwin-w32api-headers.spec b/cygwin-w32api-headers.spec index 8295e8e..5a3a7c2 100644 --- a/cygwin-w32api-headers.spec +++ b/cygwin-w32api-headers.spec @@ -2,8 +2,8 @@ #%%global branch trunk Name: cygwin-w32api-headers -Version: 3.1.0 -Release: 2 +Version: 3.2.0 +Release: 1 Summary: Win32 header files for Cygwin toolchain License: Public Domain and LGPLv2+ and ZPLv2.1 @@ -21,7 +21,6 @@ Source0: mingw-w64-code-%{snapshot_rev}-%{branch}.zip %else Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2 %endif -Patch0: mingw-w64-3.1.0-cygwin64.patch BuildRequires: cygwin32-filesystem BuildRequires: cygwin64-filesystem @@ -52,7 +51,6 @@ Cygwin x86_64 cross-compiler Win32 header files. %else %setup -q -n mingw-w64-v%{version} %endif -%patch0 -p1 %build pushd mingw-w64-headers @@ -78,6 +76,9 @@ popd %changelog +* Mon Sep 01 2014 Yaakov Selkowitz - 3.2.0-1 +- Version bump + * Sun Jan 19 2014 Yaakov Selkowitz - 3.1.0-2 - Backport upstream r6328-r6329 for Cygwin64. diff --git a/mingw-w64-3.1.0-cygwin64.patch b/mingw-w64-3.1.0-cygwin64.patch deleted file mode 100644 index 33c5ca2..0000000 --- a/mingw-w64-3.1.0-cygwin64.patch +++ /dev/null @@ -1,151 +0,0 @@ -Backport of r6328-r6329 - ---- a/mingw-w64-headers/include/winbase.h 2014-01-13 21:11:39.000000000 -0600 -+++ b/mingw-w64-headers/include/winbase.h 2014-01-13 09:52:14.000000000 -0600 -@@ -2921,36 +2921,125 @@ extern "C" { - #endif - #if MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS && defined (__cplusplus) - extern "C++" { -- FORCEINLINE unsigned InterlockedIncrement (unsigned volatile *Addend) { return (unsigned) InterlockedIncrement ((volatile __LONG32 *) Addend); } -- FORCEINLINE unsigned __LONG32 InterlockedIncrement (unsigned __LONG32 volatile *Addend) { return (unsigned __LONG32) InterlockedIncrement ((volatile __LONG32 *) Addend); } -+#if defined(__x86_64__) && defined(__CYGWIN__) -+#define __MINGW_USE_INT64_INTERLOCKED_LONG -+#endif -+ FORCEINLINE unsigned InterlockedIncrement (unsigned volatile *Addend) { -+ return (unsigned) InterlockedIncrement ((volatile __LONG32 *) Addend); -+ } -+ -+ FORCEINLINE unsigned long InterlockedIncrement (unsigned long volatile *Addend) { -+#ifndef __MINGW_USE_INT64_INTERLOCKED_LONG -+ return (unsigned __LONG32) InterlockedIncrement ((volatile __LONG32 *) Addend); -+#else -+ return (unsigned long) InterlockedIncrement64 ((volatile __int64 *) Addend); -+#endif -+ } -+ - #if defined (_WIN64) || ((_WIN32_WINNT >= 0x0502) && defined (_WINBASE_)) -- FORCEINLINE unsigned __int64 InterlockedIncrement (unsigned __int64 volatile *Addend) { return (unsigned __int64) InterlockedIncrement64 ((volatile __int64 *) Addend); } -+ FORCEINLINE unsigned __int64 InterlockedIncrement (unsigned __int64 volatile *Addend) { -+ return (unsigned __int64) InterlockedIncrement64 ((volatile __int64 *) Addend); -+ } -+#endif -+ -+ FORCEINLINE unsigned InterlockedDecrement (unsigned volatile *Addend) { -+ return (unsigned) InterlockedDecrement ((volatile __LONG32 *) Addend); -+ } -+ -+ FORCEINLINE unsigned long InterlockedDecrement (unsigned long volatile *Addend) { -+#ifndef __MINGW_USE_INT64_INTERLOCKED_LONG -+ return (unsigned __LONG32) InterlockedDecrement ((volatile __LONG32 *) Addend); -+#else -+ return (unsigned long) InterlockedDecrement64 ((volatile __int64 *) Addend); - #endif -- FORCEINLINE unsigned InterlockedDecrement (unsigned volatile *Addend) { return (unsigned __LONG32) InterlockedDecrement ((volatile __LONG32 *) Addend); } -- FORCEINLINE unsigned __LONG32 InterlockedDecrement (unsigned __LONG32 volatile *Addend) { return (unsigned __LONG32) InterlockedDecrement ((volatile __LONG32 *) Addend); } -+ } -+ - #if defined (_WIN64) || ((_WIN32_WINNT >= 0x0502) && defined (_WINBASE_)) -- FORCEINLINE unsigned __int64 InterlockedDecrement (unsigned __int64 volatile *Addend) { return (unsigned __int64) InterlockedDecrement64 ((volatile __int64 *) Addend); } -+ FORCEINLINE unsigned __int64 InterlockedDecrement (unsigned __int64 volatile *Addend) { -+ return (unsigned __int64) InterlockedDecrement64 ((volatile __int64 *) Addend); -+ } -+#endif -+ -+ FORCEINLINE unsigned InterlockedExchange (unsigned volatile *Target, unsigned Value) { -+ return (unsigned) InterlockedExchange ((volatile __LONG32 *) Target,(__LONG32) Value); -+ } -+ -+ FORCEINLINE unsigned long InterlockedExchange (unsigned long volatile *Target, unsigned long Value) { -+#ifndef __MINGW_USE_INT64_INTERLOCKED_LONG -+ return (unsigned __LONG32) InterlockedExchange ((volatile __LONG32 *) Target,(__LONG32) Value); -+#else -+ return (unsigned long) InterlockedExchange64 ((volatile __int64 *) Target,(__int64) Value); - #endif -- FORCEINLINE unsigned InterlockedExchange (unsigned volatile *Target, unsigned Value) { return (unsigned) InterlockedExchange ((volatile __LONG32 *) Target,(__LONG32) Value); } -- FORCEINLINE unsigned __LONG32 InterlockedExchange (unsigned __LONG32 volatile *Target, unsigned __LONG32 Value) { return (unsigned __LONG32) InterlockedExchange ((volatile __LONG32 *) Target,(__LONG32) Value); } -+ } -+ - #if defined (_WIN64) || ((_WIN32_WINNT >= 0x0502) && defined (_WINBASE_)) -- FORCEINLINE unsigned __int64 InterlockedExchange (unsigned __int64 volatile *Target, unsigned __int64 Value) { return (unsigned __int64) InterlockedExchange64 ((volatile __int64 *) Target,(__int64) Value); } -+ FORCEINLINE unsigned __int64 InterlockedExchange (unsigned __int64 volatile *Target, unsigned __int64 Value) { -+ return (unsigned __int64) InterlockedExchange64 ((volatile __int64 *) Target,(__int64) Value); -+ } -+#endif -+ -+ FORCEINLINE unsigned InterlockedExchangeAdd (unsigned volatile *Addend, unsigned Value) { -+ return (unsigned) InterlockedExchangeAdd ((volatile __LONG32 *) Addend,(__LONG32) Value); -+ } -+ -+ FORCEINLINE unsigned InterlockedExchangeSubtract (unsigned volatile *Addend, unsigned Value) { -+ return (unsigned) InterlockedExchangeAdd ((volatile __LONG32 *) Addend,- (__LONG32) Value); -+ } -+ -+ FORCEINLINE unsigned long InterlockedExchangeAdd (unsigned long volatile *Addend, unsigned long Value) { -+#ifndef __MINGW_USE_INT64_INTERLOCKED_LONG -+ return (unsigned __LONG32) InterlockedExchangeAdd ((volatile __LONG32 *) Addend,(__LONG32) Value); -+#else -+ return (unsigned __int64) InterlockedExchangeAdd64 ((volatile __int64 *) Addend,(__int64) Value); -+#endif -+ } -+ -+ FORCEINLINE unsigned long InterlockedExchangeSubtract (unsigned long volatile *Addend, unsigned long Value) { -+#ifndef __MINGW_USE_INT64_INTERLOCKED_LONG -+ return (unsigned __LONG32) InterlockedExchangeAdd ((volatile __LONG32 *) Addend,- (__LONG32) Value); -+#else -+ return (unsigned long) InterlockedExchangeAdd64 ((volatile __int64 *) Addend,- (__int64) Value); - #endif -- FORCEINLINE unsigned InterlockedExchangeAdd (unsigned volatile *Addend, unsigned Value) { return (unsigned) InterlockedExchangeAdd ((volatile __LONG32 *) Addend,(__LONG32) Value); } -- FORCEINLINE unsigned InterlockedExchangeSubtract (unsigned volatile *Addend, unsigned Value) { return (unsigned) InterlockedExchangeAdd ((volatile __LONG32 *) Addend,- (__LONG32) Value); } -- FORCEINLINE unsigned __LONG32 InterlockedExchangeAdd (unsigned __LONG32 volatile *Addend, unsigned __LONG32 Value) { return (unsigned __LONG32) InterlockedExchangeAdd ((volatile __LONG32 *) Addend,(__LONG32) Value); } -- FORCEINLINE unsigned __LONG32 InterlockedExchangeSubtract (unsigned __LONG32 volatile *Addend, unsigned __LONG32 Value) { return (unsigned __LONG32) InterlockedExchangeAdd ((volatile __LONG32 *) Addend,- (__LONG32) Value); } -+ } -+ - #if defined (_WIN64) || ((_WIN32_WINNT >= 0x0502) && defined (_WINBASE_)) -- FORCEINLINE unsigned __int64 InterlockedExchangeAdd (unsigned __int64 volatile *Addend, unsigned __int64 Value) { return (unsigned __int64) InterlockedExchangeAdd64 ((volatile __int64 *) Addend,(__int64) Value); } -- FORCEINLINE unsigned __int64 InterlockedExchangeSubtract (unsigned __int64 volatile *Addend, unsigned __int64 Value) { return (unsigned __int64) InterlockedExchangeAdd64 ((volatile __int64 *) Addend,- (__int64) Value); } -+ FORCEINLINE unsigned __int64 InterlockedExchangeAdd (unsigned __int64 volatile *Addend, unsigned __int64 Value) { -+ return (unsigned __int64) InterlockedExchangeAdd64 ((volatile __int64 *) Addend,(__int64) Value); -+ } -+ -+ FORCEINLINE unsigned __int64 InterlockedExchangeSubtract (unsigned __int64 volatile *Addend, unsigned __int64 Value) { -+ return (unsigned __int64) InterlockedExchangeAdd64 ((volatile __int64 *) Addend,- (__int64) Value); -+ } -+#endif -+ -+ FORCEINLINE unsigned InterlockedCompareExchange (unsigned volatile *Destination, unsigned Exchange, unsigned Comperand) { -+ return (unsigned) InterlockedCompareExchange ((volatile __LONG32 *) Destination,(__LONG32) Exchange,(__LONG32) Comperand); -+ } -+ -+ FORCEINLINE unsigned long InterlockedCompareExchange (unsigned long volatile *Destination, unsigned long Exchange, unsigned long Comperand) { -+#ifndef __MINGW_USE_INT64_INTERLOCKED_LONG -+ return (unsigned __LONG32) InterlockedCompareExchange ((volatile __LONG32 *) Destination,(__LONG32) Exchange,(__LONG32) Comperand); -+#else -+ return (unsigned long) InterlockedCompareExchange64 ((volatile __int64 *) Destination,(__int64) Exchange,(__int64) Comperand); - #endif -- FORCEINLINE unsigned InterlockedCompareExchange (unsigned volatile *Destination, unsigned Exchange, unsigned Comperand) { return (unsigned) InterlockedCompareExchange ((volatile __LONG32 *) Destination,(__LONG32) Exchange,(__LONG32) Comperand); } -- FORCEINLINE unsigned __LONG32 InterlockedCompareExchange (unsigned __LONG32 volatile *Destination, unsigned __LONG32 Exchange, unsigned __LONG32 Comperand) { return (unsigned __LONG32) InterlockedCompareExchange ((volatile __LONG32 *) Destination,(__LONG32) Exchange,(__LONG32) Comperand); } -+ } -+ - #if defined (_WIN64) || ((_WIN32_WINNT >= 0x0502) && defined (_WINBASE_)) -- FORCEINLINE unsigned __int64 InterlockedCompareExchange (unsigned __int64 volatile *Destination, unsigned __int64 Exchange, unsigned __int64 Comperand) { return (unsigned __int64) InterlockedCompareExchange64 ((volatile __int64 *) Destination,(__int64) Exchange,(__int64) Comperand); } -- FORCEINLINE unsigned __int64 InterlockedAnd (unsigned __int64 volatile *Destination, unsigned __int64 Value) { return (unsigned __int64) InterlockedAnd64 ((volatile __int64 *) Destination,(__int64) Value); } -- FORCEINLINE unsigned __int64 InterlockedOr (unsigned __int64 volatile *Destination, unsigned __int64 Value) { return (unsigned __int64) InterlockedOr64 ((volatile __int64 *) Destination,(__int64) Value); } -- FORCEINLINE unsigned __int64 InterlockedXor (unsigned __int64 volatile *Destination, unsigned __int64 Value) { return (unsigned __int64) InterlockedXor64 ((volatile __int64 *) Destination,(__int64) Value); } -+ FORCEINLINE unsigned __int64 InterlockedCompareExchange (unsigned __int64 volatile *Destination, unsigned __int64 Exchange, unsigned __int64 Comperand) { -+ return (unsigned __int64) InterlockedCompareExchange64 ((volatile __int64 *) Destination,(__int64) Exchange,(__int64) Comperand); -+ } -+ -+ FORCEINLINE unsigned __int64 InterlockedAnd (unsigned __int64 volatile *Destination, unsigned __int64 Value) { -+ return (unsigned __int64) InterlockedAnd64 ((volatile __int64 *) Destination,(__int64) Value); -+ } -+ -+ FORCEINLINE unsigned __int64 InterlockedOr (unsigned __int64 volatile *Destination, unsigned __int64 Value) { -+ return (unsigned __int64) InterlockedOr64 ((volatile __int64 *) Destination,(__int64) Value); -+ } -+ -+ FORCEINLINE unsigned __int64 InterlockedXor (unsigned __int64 volatile *Destination, unsigned __int64 Value) { -+ return (unsigned __int64) InterlockedXor64 ((volatile __int64 *) Destination,(__int64) Value); -+ } - #endif - } - #endif -- cgit