urlmon: Remove unneeded NONAMELESSXXX directives.

Also put them in the files that need them.

urlmon: Remove unneeded NONAMELESSXXX directives.
16960a42 · Francois Gouget · Alexandre Julliard · a1edebef · 16960a42 · 16960a42
Commit 16960a42 authored Mar 26, 2015 by Francois Gouget Committed by Alexandre Julliard Mar 27, 2015
Showing with 6 additions and 3 deletions

binding.c dlls/urlmon/binding.c +2 -0

http.c dlls/urlmon/http.c +2 -0

sec_mgr.c dlls/urlmon/tests/sec_mgr.c +0 -1

urlmon_main.c dlls/urlmon/urlmon_main.c +2 -0

urlmon_main.h dlls/urlmon/urlmon_main.h +0 -2

No files found.
--- a/dlls/urlmon/binding.c
+++ b/dlls/urlmon/binding.c
@@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#define NONAMELESSUNION
+
 #include "urlmon_main.h"
 #include "winreg.h"
 #include "shlwapi.h"

--- a/dlls/urlmon/http.c
+++ b/dlls/urlmon/http.c
@@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#define NONAMELESSUNION
+
 #include "urlmon_main.h"
 #include "wininet.h"


--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -20,7 +20,6 @@

 #define COBJMACROS
 #define CONST_VTABLE
-#define NONAMELESSUNION

 /* needed for IInternetZoneManagerEx2 */
 #define _WIN32_IE 0x0700

--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -20,6 +20,8 @@

 #include <stdarg.h>

+#define NONAMELESSUNION
+
 #include "urlmon_main.h"

 #include "winreg.h"

--- a/dlls/urlmon/urlmon_main.h
+++ b/dlls/urlmon/urlmon_main.h
@@ -23,8 +23,6 @@
 #include <stdarg.h>

 #define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT

 #include "windef.h"
 #include "winbase.h"