Upgrading headers to newer snapshot

OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-headers?expand=0&rev=18
This commit is contained in:
Fridrich Strba 2011-05-16 09:03:42 +00:00 committed by Git OBS Bridge
parent 8c0c01ae0d
commit 9c721f0254
5 changed files with 4 additions and 99 deletions

View File

@ -1,11 +0,0 @@
--- include/winnt.h (revision 3516)
+++ include/winnt.h (revision 3517)
@@ -3121,7 +3121,7 @@
__MINGW_EXTENSION union {
PVOID FiberData;
DWORD Version;
- } DUMMYUNIONNAME;
+ };
PVOID ArbitraryUserPointer;
struct _NT_TIB *Self;
} NT_TIB;

View File

@ -1,80 +0,0 @@
--- mingw-w64-headers-1.0b.20100818/ddk/include/ddk/wdm.h 2010-08-16 22:18:25.000000000 +0200
+++ mingw-w64-headers-1.0b.20100818/ddk/include/ddk/wdm.h 2010-09-06 09:06:31.000000000 +0200
@@ -56,7 +56,11 @@
#endif /* _MAC */
#ifndef _KTMTYPES_
+#ifdef _MSC_VER
typedef GUID UOW, *PUOW;
+#else
+typedef GUID *PUOW;
+#endif
#endif
typedef GUID *PGUID;
@@ -14960,10 +14964,10 @@
} ENLISTMENT_INFORMATION_CLASS;
typedef struct _TRANSACTION_LIST_ENTRY {
-#if defined(__cplusplus)
- ::UOW UOW;
-#else
+#ifdef _MSC_VER
UOW UOW;
+#else
+ GUID UOW;
#endif
} TRANSACTION_LIST_ENTRY, *PTRANSACTION_LIST_ENTRY;
--- mingw-w64-headers-1.0b.20100818/include/ktmtypes.h 2010-08-17 10:51:42.000000000 +0200
+++ mingw-w64-headers-1.0b.20100818/include/ktmtypes.h 2010-09-06 09:06:31.000000000 +0200
@@ -92,7 +92,11 @@
#define MAX_RESOURCEMANAGER_DESCRIPTION_LENGTH 64
#ifndef _WDMDDK_
+#ifdef _MSC_VER
typedef GUID UOW, *PUOW;
+#else
+typedef GUID *PUOW;
+#endif
#endif
typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID;
@@ -126,7 +130,11 @@
typedef struct _TRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT {
ULONG PropagationCookie;
+#ifdef _MSC_VER
+ UOW UOW;
+#else
GUID UOW;
+#endif
GUID TmIdentity;
ULONG BufferLength;
} TRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT, *PTRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT,
@@ -134,7 +142,11 @@
typedef struct _TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT {
ULONG MarshalCookie;
+#ifdef _MSC_VER
+ UOW UOW;
+#else
GUID UOW;
+#endif
} TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT, *PTRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT;
typedef struct _KCRM_MARSHAL_HEADER {
@@ -145,10 +157,10 @@
} KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER;
typedef struct _KCRM_TRANSACTION_BLOB {
-#if defined(__cplusplus)
- ::UOW UOW;
-#else
+#ifdef _MSC_VER
UOW UOW;
+#else
+ GUID UOW;
#endif
GUID TmIdentity;
ULONG IsolationLevel;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d838ed451a5c5f0ea10a4476129eb7e2a83fea25538f6b67cc6467cb0875aeb7
size 3224850

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cba9abd79cca788bd8306056343a258be402a7a17fc7af2b006c5b426d26adb0
size 3288915

View File

@ -1,7 +1,7 @@
%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
Name: mingw64-headers
Version: 1.0b.20100818
Version: 1.0b.20110505
Release: 0
Summary: MinGW-W64 headers for win32 and win64
@ -11,8 +11,6 @@ URL: http://www.mingw.org/
Source0: mingw-w64-headers-%{version}.tar.bz2
Source1000: %{name}-rpmlintrc
Patch0: mingw-w64-headers-1.0b.20100818-uow.patch
Patch1: mingw-w64-headers-1.0b.20100818-namelessunion.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -27,8 +25,6 @@ MinGW Win64 headers.
%prep
%setup -q -n mingw-w64-headers-%{version}
%patch0 -p1
%patch1 -p0
%build
./configure --host=%{_mingw64_target} \