From ca1545cf1734a9a2de7222bf8c1585e0ade4fc5e Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Sat, 14 Mar 2015 03:38:17 +0100
Subject: [PATCH] ntdll: Remove unneeded NONAMELESSXXX directives.

---
 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 20a98ec76b0..6ea7b541739 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 62c3d16aebe..34910e77986 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 283fe490c46..cbfc022be80 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 3bd2c313dc3..92e83dde6b6 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 4ef44cfaa76..a908f197e51 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 e1444d22a53..9810f077cb4 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 9f73ce63dd9..91d9be9c8fe 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 08fab44405d..7d44e601946 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 df460158c81..fef31cb3458 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 0f14a3ee3af..69bd7364062 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 dc5db004e45..ab6bf9b27a6 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"