[PATCH] xaudio2: Avoid redefining several F3DAudio related constants.

[Gerald Pfeifer]

On Fri, 1 May 2020, Andrew Eikum wrote:
> I've opened a pull request for this:
> https://github.com/FNA-XNA/FAudio/pull/187
> 
> FAudio makes a new release every month. If it's just fixing compiler
> warnings, I'm not sure it's worth the change in Wine.

Thank you, Andrew! That worked quite well (and fast). :-)

Still, don't we usually want to have system headers before ours?
Or is this somewhat different?

Gerald


Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
---
 dlls/xaudio2_7/x3daudio.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c
index 240cd5c101..6f16ba3470 100644
--- a/dlls/xaudio2_7/x3daudio.c
+++ b/dlls/xaudio2_7/x3daudio.c
@@ -20,15 +20,13 @@
 #include "config.h"
 
 #include <stdarg.h>
-
+#include <F3DAudio.h>
 #include "windef.h"
 #include "winbase.h"
 #include "x3daudio.h"
 
 #include "wine/debug.h"
 
-#include <F3DAudio.h>
-
 #if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER
 WINE_DEFAULT_DEBUG_CHANNEL(xaudio2);
 #endif
-- 
2.25.0