ntdll: Remove unneeded NONAMELESSXXX directives. (try2)

[Francois Gouget]

---

This replaces the previous patch which did not compile in 64bit.

 dlls/ntdll/actctx.c    | 3 +--
 dlls/ntdll/cdrom.c     | 3 +--
 dlls/ntdll/directory.c | 3 +--
 dlls/ntdll/file.c      | 3 +--
 dlls/ntdll/heap.c      | 3 +--
 dlls/ntdll/loader.c    | 4 +---
 dlls/ntdll/serial.c    | 3 +--
 dlls/ntdll/sync.c      | 4 +---
 dlls/ntdll/tape.c      | 3 +--
 dlls/ntdll/time.c      | 2 --
 dlls/ntdll/virtual.c   | 3 +--
 11 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 20a98ec..6ea7b54 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -28,10 +28,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "winternl.h"
 #include "ddk/wdm.h"
 #include "ntdll_misc.h"
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index 62c3d16..34910e7 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -116,10 +116,9 @@ typedef struct
 
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winternl.h"
 #include "winioctl.h"
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 283fe49..cbfc022 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -70,10 +70,9 @@
 # include <unistd.h>
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winnt.h"
 #include "winternl.h"
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 48ed74d..eeddca0 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -76,10 +76,9 @@
 # include <valgrind/memcheck.h>
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "wine/server.h"
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 4ef44cf..a908f19 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -33,10 +33,9 @@
 #define RUNNING_ON_VALGRIND 0
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winnt.h"
 #include "winternl.h"
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index e1444d2..9810f07 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -28,11 +28,9 @@
 # include <sys/mman.h>
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winnt.h"
 #include "winternl.h"
diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c
index 9f73ce6..91d9be9 100644
--- a/dlls/ntdll/serial.c
+++ b/dlls/ntdll/serial.c
@@ -57,10 +57,9 @@
 # include <sys/strtio.h>
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winternl.h"
 #include "winioctl.h"
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 08fab44..7d44e60 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -48,11 +48,9 @@
 #include <stdlib.h>
 #include <time.h>
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winternl.h"
 #include "wine/server.h"
diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c
index df46015..fef31cb 100644
--- a/dlls/ntdll/tape.c
+++ b/dlls/ntdll/tape.c
@@ -48,10 +48,9 @@
 #define MTSETBLK MTSETBSIZ
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winternl.h"
 #include "winioctl.h"
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 0f14a3e..69bd736 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -42,8 +42,6 @@
 # include <mach/mach_time.h>
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index dc5db00..ab6bf9b 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -42,10 +42,9 @@
 # include <valgrind/valgrind.h>
 #endif
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winternl.h"
 #include "wine/library.h"
-- 
2.1.4