Francois Gouget : ieframe: Remove unneeded NONAMELESSXXX directives.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Thu Mar 12 11:11:10 2015 +0100

ieframe: Remove unneeded NONAMELESSXXX directives.

Move a NONAMELESSUNION directive to the one C file that needs it.

---

dlls/ieframe/ieframe.h  | 1 -
 dlls/ieframe/intshcut.c | 2 ++
 dlls/ieframe/navigate.c | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h
index cdfdf21..f8c204c 100644
--- a/dlls/ieframe/ieframe.h
+++ b/dlls/ieframe/ieframe.h
@@ -21,7 +21,6 @@
 #include <stdarg.h>

#define COBJMACROS
-#define NONAMELESSUNION

#include "windef.h"
 #include "winbase.h"
diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c
index a780fea..b2d3ba9 100644
--- a/dlls/ieframe/intshcut.c
+++ b/dlls/ieframe/intshcut.c
@@ -29,6 +29,8 @@

#include <stdio.h>

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

#include "shlobj.h"
diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index d1a9a50..9c5b88a 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -17,7 +17,6 @@
  */

#define NONAMELESSUNION
-#define NONAMELESSSTRUCT

#include "ieframe.h"