Module: wine Branch: master Commit: cd0200113c9f9c3556645599945c449933c6207f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0200113c9f9c355664559994...
Author: Francois Gouget fgouget@free.fr Date: Wed Mar 18 18:59:06 2015 +0100
riched20: Remove unneeded NONAMELESSXXX directives.
---
dlls/riched20/clipboard.c | 2 ++ dlls/riched20/editor.c | 2 ++ dlls/riched20/editstr.h | 2 -- dlls/riched20/richole.c | 1 - dlls/riched20/txthost.c | 2 -- dlls/riched20/txtsrv.c | 2 -- 6 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 250a233..c536665 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#define NONAMELESSUNION + #include "editor.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4da2369..146e4be 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -224,6 +224,8 @@ * */
+#define NONAMELESSUNION + #include "editor.h" #include "commdlg.h" #include "winreg.h" diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 4fd965c..1b1eda6 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -32,8 +32,6 @@ #include <limits.h>
#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT
#include <windef.h> #include <winbase.h> diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c62998a..db55e84 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -22,7 +22,6 @@ #include <stdarg.h>
#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS
#include "windef.h" diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 4b72d8b..af32c1a 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -21,8 +21,6 @@ #include "config.h" #include "wine/port.h"
-#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS
#include "editor.h" diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 75bee6d..e9c1061 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -21,8 +21,6 @@ #include "config.h" #include "wine/port.h"
-#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS
#include "editor.h"