Rebase against 042e0625695a82aa71ddf825c693680d5d8aa0dd

This commit is contained in:
Alistair Leslie-Hughes
2019-05-16 08:50:22 +10:00
parent 6ce73c283d
commit 1b7ebd3bb8
12 changed files with 45 additions and 731 deletions

View File

@@ -0,0 +1,25 @@
From f917f4fe0b07dc32dac01c6759de8e10217d4143 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 16 May 2019 08:45:11 +1000
Subject: [PATCH] Revert "xaudio2: Fix 32-bit build."
This reverts commit 2de9d9ec440cb29460ca8ceeaa11c867c5d29359.
---
dlls/xaudio2_7/xaudio_dll.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
index 70ba243..cbbedc4 100644
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -35,7 +35,6 @@
#include "ole2.h"
#include "rpcproxy.h"
-#include "wine/asm.h"
#include "wine/debug.h"
#include "wine/heap.h"
--
1.9.1