Francois Gouget : ole32: Remove unneeded NONAMELESSXXX directives.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 17 11:01:58 CDT 2015
Module: wine
Branch: master
Commit: 7fe0600237b924fa1c5282f677e202ac22d8aef7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe0600237b924fa1c5282f677e202ac22d8aef7
Author: Francois Gouget <fgouget at free.fr>
Date: Mon Mar 16 19:07:43 2015 +0100
ole32: Remove unneeded NONAMELESSXXX directives.
---
dlls/ole32/antimoniker.c | 1 -
dlls/ole32/classmoniker.c | 2 --
dlls/ole32/clipboard.c | 1 -
dlls/ole32/compobj.c | 1 -
dlls/ole32/compositemoniker.c | 2 --
dlls/ole32/datacache.c | 2 +-
dlls/ole32/filemoniker.c | 1 -
dlls/ole32/git.c | 2 --
dlls/ole32/hglobalstream.c | 1 -
dlls/ole32/itemmoniker.c | 1 -
dlls/ole32/memlockbytes.c | 1 -
dlls/ole32/ole2.c | 1 -
dlls/ole32/ole2impl.c | 1 -
dlls/ole32/ole2stubs.c | 2 --
dlls/ole32/oleobj.c | 1 -
dlls/ole32/oleproxy.c | 2 --
dlls/ole32/pointermoniker.c | 1 -
dlls/ole32/rpc.c | 1 -
dlls/ole32/stg_prop.c | 1 -
dlls/ole32/stg_stream.c | 1 -
dlls/ole32/storage32.c | 1 -
dlls/ole32/stubmanager.c | 2 --
dlls/ole32/usrmarshal.c | 1 -
23 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 6b62f5e..83eb71b 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -24,7 +24,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c
index 89c7297..1bcf58f 100644
--- a/dlls/ole32/classmoniker.c
+++ b/dlls/ole32/classmoniker.c
@@ -24,8 +24,6 @@
#include <string.h>
#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "winerror.h"
#include "windef.h"
diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c
index d40ee59..c7d58d6 100644
--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -65,7 +65,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 82cc77d..e2efe58 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -45,7 +45,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "ntstatus.h"
#define WIN32_NO_STATUS
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index faadca1..e431bfc 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -23,8 +23,6 @@
#include <string.h>
#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index 3e5e99c..6ae9367 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -43,12 +43,12 @@
* header. I was able to figure-out where the extent of the object
* was stored and the aspect, but that's about it.
*/
+
#include <stdarg.h>
#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 732d6ac..c9b4e50 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -25,7 +25,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c
index b83d415..f7a0460 100644
--- a/dlls/ole32/git.c
+++ b/dlls/ole32/git.c
@@ -27,8 +27,6 @@
#include <stdarg.h>
#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c
index ce0f34c..ff1dfa2 100644
--- a/dlls/ole32/hglobalstream.c
+++ b/dlls/ole32/hglobalstream.c
@@ -31,7 +31,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index d5fb0a8..e8e5d23 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -24,7 +24,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "winerror.h"
#include "windef.h"
diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c
index 81d3b32..b2fc5b4 100644
--- a/dlls/ole32/memlockbytes.c
+++ b/dlls/ole32/memlockbytes.c
@@ -27,7 +27,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 38b23dc..b0a8c3b 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -33,7 +33,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c
index 152132b..4be79a7 100644
--- a/dlls/ole32/ole2impl.c
+++ b/dlls/ole32/ole2impl.c
@@ -23,7 +23,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c
index 5a90e2d..ba32165 100644
--- a/dlls/ole32/ole2stubs.c
+++ b/dlls/ole32/ole2stubs.c
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index 968456d..edbef55 100644
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -25,7 +25,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c
index 184aca1..8351f27 100644
--- a/dlls/ole32/oleproxy.c
+++ b/dlls/ole32/oleproxy.c
@@ -27,8 +27,6 @@
#include <string.h>
#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c
index 96b580a..212a8aa 100644
--- a/dlls/ole32/pointermoniker.c
+++ b/dlls/ole32/pointermoniker.c
@@ -24,7 +24,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index ce39849..2455464 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -28,7 +28,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index b0cd542..da361ce 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -47,7 +47,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index 7738cf1..a3abf46 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -31,7 +31,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index b4401a6..f09beec 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -38,7 +38,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c
index fbbf413..fda4944 100644
--- a/dlls/ole32/stubmanager.c
+++ b/dlls/ole32/stubmanager.c
@@ -24,8 +24,6 @@
*/
#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include <assert.h>
#include <stdarg.h>
diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c
index 6687ac2..cd16fb2 100644
--- a/dlls/ole32/usrmarshal.c
+++ b/dlls/ole32/usrmarshal.c
@@ -24,7 +24,6 @@
#define COBJMACROS
#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
More information about the wine-cvs
mailing list