From 14aa446f1d8d8e89fd9c6c314cd61bc74c1aae60 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Fri, 20 Mar 2015 09:50:41 +0100
Subject: [PATCH] shlwapi: Remove unneeded NONAMELESSXXX directives.

---
 dlls/shlwapi/istream.c   | 1 -
 dlls/shlwapi/msgbox.c    | 2 --
 dlls/shlwapi/ordinal.c   | 2 --
 dlls/shlwapi/stopwatch.c | 2 +-
 dlls/shlwapi/string.c    | 2 +-
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c
index bbd331ad754..e6419951fbc 100644
--- a/dlls/shlwapi/istream.c
+++ b/dlls/shlwapi/istream.c
@@ -22,7 +22,6 @@
 
 #define COBJMACROS
 #define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c
index 506bd4651b7..90bbb592bfb 100644
--- a/dlls/shlwapi/msgbox.c
+++ b/dlls/shlwapi/msgbox.c
@@ -24,8 +24,6 @@
 #include <stdarg.h>
 #include <string.h>
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 0ea235cf2db..3da25b49c82 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -28,8 +28,6 @@
 #include <string.h>
 
 #define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/shlwapi/stopwatch.c b/dlls/shlwapi/stopwatch.c
index 7f86fded4b4..7a7007e5a08 100644
--- a/dlls/shlwapi/stopwatch.c
+++ b/dlls/shlwapi/stopwatch.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 #define NONAMELESSUNION
-#define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index 6e90b4e57e0..4d77c3f2e99 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #define NONAMELESSUNION
-#define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #define NO_SHLWAPI_REG