urlmon: Remove unneeded NONAMELESSXXX directives.
Francois Gouget
fgouget at free.fr
Thu Mar 26 09:29:22 CDT 2015
Also put them in the files that need them.
---
dlls/urlmon/binding.c | 2 ++
dlls/urlmon/http.c | 2 ++
dlls/urlmon/tests/sec_mgr.c | 1 -
dlls/urlmon/urlmon_main.c | 2 ++
dlls/urlmon/urlmon_main.h | 2 --
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c
index 306e9b3..9b78582 100644
--- 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"
diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c
index 16e5fad..b0c7d2a 100644
--- 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"
diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index e41f0b6..4092842 100644
--- 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
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index 1204a62..c4f1cec 100644
--- 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"
diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h
index 12be0ed..fd13279 100644
--- 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"
--
2.1.4
More information about the wine-patches
mailing list