From 359fbe829a6ffa7c3d13df306cfac35dd8f8c472 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Wed, 11 Mar 2015 11:30:29 +0100
Subject: [PATCH] dsound: Remove unneeded NONAMELESSXXX directives.

---
 dlls/dsound/buffer.c         | 2 --
 dlls/dsound/capture.c        | 3 +--
 dlls/dsound/dsound.c         | 3 +--
 dlls/dsound/dsound_convert.c | 2 --
 dlls/dsound/dsound_main.c    | 2 +-
 dlls/dsound/duplex.c         | 2 --
 dlls/dsound/mixer.c          | 3 +--
 dlls/dsound/primary.c        | 2 +-
 dlls/dsound/propset.c        | 4 ++--
 dlls/dsound/sound3d.c        | 2 --
 10 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index e581c5a9b47..4e84d17af8f 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -23,8 +23,6 @@
 
 #define COBJMACROS
 
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 17b1a04b994..0764261fc0b 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -28,8 +28,7 @@
 #include <stdarg.h>
 
 #define COBJMACROS
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 7e53f911a38..824f581b9a4 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -26,8 +26,7 @@
 #include <math.h>
 
 #define COBJMACROS
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c
index 5ac7a102cde..5accba6b7c4 100644
--- a/dlls/dsound/dsound_convert.c
+++ b/dlls/dsound/dsound_convert.c
@@ -39,8 +39,6 @@
 #include <stdarg.h>
 #include <math.h>
 
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
 #include "windef.h"
 #include "winbase.h"
 #include "mmsystem.h"
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index d6be926c5a8..cb46301f92c 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -35,8 +35,8 @@
 #include <stdarg.h>
 
 #define COBJMACROS
-#define NONAMELESSSTRUCT
 #define NONAMELESSUNION
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c
index a2bc7267221..b18972e7f16 100644
--- a/dlls/dsound/duplex.c
+++ b/dlls/dsound/duplex.c
@@ -22,8 +22,6 @@
 
 #include <stdarg.h>
 
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
 #define COBJMACROS
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index db1152ce1a3..8dbd15ad1a5 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -27,8 +27,7 @@
 #include <math.h>	/* Insomnia - pow() function */
 
 #define COBJMACROS
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
+
 #include "windef.h"
 #include "winbase.h"
 #include "mmsystem.h"
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index 52d00f92616..3f8a4781e60 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -26,8 +26,8 @@
 #include <stdarg.h>
 
 #define COBJMACROS
-#define NONAMELESSSTRUCT
 #define NONAMELESSUNION
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 6c0b9f409ba..b89c45ad903 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
 #define COBJMACROS
-#define NONAMELESSSTRUCT
 #define NONAMELESSUNION
-#include <stdarg.h>
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
index 439cfaca9ee..9a0226a69a3 100644
--- a/dlls/dsound/sound3d.c
+++ b/dlls/dsound/sound3d.c
@@ -40,8 +40,6 @@
 #include <stdarg.h>
 #include <math.h>	/* Insomnia - pow() function */
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-- 
2.11.4.GIT