Francois Gouget : dsound: Remove unneeded NONAMELESSXXX directives.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 359fbe829a6ffa7c3d13df306cfac35dd8f8c472
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=359fbe829a6ffa7c3d13df306cfac35dd8f8c472

Author: Francois Gouget <fgouget at free.fr>
Date:   Wed Mar 11 11:30:29 2015 +0100

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 e581c5a..4e84d17 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 17b1a04..0764261 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 7e53f91..824f581 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 5ac7a10..5accba6 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 d6be926..cb46301 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 a2bc726..b18972e 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 db1152c..8dbd15a 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 52d00f9..3f8a478 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 6c0b9f4..b89c45a 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 439cfac..9a0226a 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"