From 351d907bbd0872e3b3a0dfaf8f6d405a9e1b877e Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 20 Mar 2015 09:46:28 +0100 Subject: [PATCH] shell32: Remove unneeded NONAMELESSXXX directives. --- dlls/shell32/brsfolder.c | 1 - dlls/shell32/changenotify.c | 2 -- dlls/shell32/cpanelfolder.c | 1 - dlls/shell32/dataobject.c | 1 - dlls/shell32/ebrowser.c | 1 - dlls/shell32/pidl.c | 1 - dlls/shell32/shelldispatch.c | 2 -- dlls/shell32/shellitem.c | 1 - dlls/shell32/shellstring.c | 2 +- dlls/shell32/shfldr_desktop.c | 1 - dlls/shell32/shfldr_fs.c | 1 - dlls/shell32/shfldr_mycomp.c | 1 - dlls/shell32/shfldr_netplaces.c | 2 -- dlls/shell32/shfldr_printers.c | 2 -- dlls/shell32/shfldr_unixfs.c | 1 - dlls/shell32/shlfolder.c | 1 - dlls/shell32/shlview.c | 1 - dlls/shell32/shlview_cmenu.c | 1 - dlls/shell32/systray.c | 1 - 19 files changed, 1 insertion(+), 23 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 145ee092706..1a2716ebe00 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -26,7 +26,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "wine/debug.h" #include "undocshell.h" diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 2fba5b9c62e..2efb297ad57 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -21,8 +21,6 @@ #include #include -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wine/list.h" diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 7bc4b3a2320..1a3b379f9a0 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -28,7 +28,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index b8b5a873770..64a9401cc82 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "wingdi.h" diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index b5cc21fbe91..afeb821e13e 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -22,7 +22,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 794ff12db09..d16ca571e50 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -32,7 +32,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index d83b277cd6a..d2c899d6fa9 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -24,8 +24,6 @@ #include #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index b5d70dcf05d..b1cae7e53c4 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -26,7 +26,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 9eb8536b3d0..956fd508719 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -23,7 +23,7 @@ #include #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winnls.h" diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 815a421c934..4aa1dcfef67 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -30,7 +30,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 357e4ffa2af..d8bcb4ceccc 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -30,7 +30,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index ac7fd482f63..767509bb8ea 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -29,7 +29,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 36d18bc8173..16e7cd5a895 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -29,8 +29,6 @@ #include #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 7ee654802f2..fb1b6a9467a 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -22,8 +22,6 @@ #include #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9d10d64a5e9..b3b02142929 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -148,7 +148,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 0fb8df95296..46ccc56e143 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -31,7 +31,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 48409ffc216..2c3a908d10f 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -45,7 +45,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winerror.h" diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 8170011ea65..099f5bc4ade 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "wine/debug.h" diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 59df2f8f51a..dfa30ff267e 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -21,7 +21,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include -- 2.11.4.GIT