From: Francois Gouget <fgouget@free.fr>
Subject: mountmgr.sys: remove unneeded NONAMELESSXXX directives.
Message-Id: <alpine.DEB.2.11.1503051701560.7245@amboise>
Date: Thu, 5 Mar 2015 17:31:32 +0100 (CET)

Also put them in the files that need them.
---

I think it's better to define them in the C files where they are needed. 
In any case they should not be defined in both (see mountmgr.c) and it 
turns out NONAMELESSSTRUCT is not needed at all.

 dlls/mountmgr.sys/device.c   | 2 ++
 dlls/mountmgr.sys/mountmgr.c | 1 -
 dlls/mountmgr.sys/mountmgr.h | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index 7ee4078..5003d4d 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -27,6 +27,8 @@
 #include <stdio.h>
 #include <sys/time.h>
 
+#define NONAMELESSUNION
+
 #include "mountmgr.h"
 #include "winreg.h"
 #include "winuser.h"
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
index d7bc8d7..10286dc 100644
--- a/dlls/mountmgr.sys/mountmgr.c
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -22,7 +22,6 @@
 #include <unistd.h>
 
 #define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 
 #include "mountmgr.h"
 #include "winreg.h"
diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h
index d1e814f..2f0db62 100644
--- a/dlls/mountmgr.sys/mountmgr.h
+++ b/dlls/mountmgr.sys/mountmgr.h
@@ -20,9 +20,6 @@
 
 #include <stdarg.h>
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"

-- 
2.1.4