Define WIN32_NO_STATUS so we don't get 'duplicate macro' errors when

compiling with the PSDK and MSVC. Add some types that are not defined by the PSDK.

Define WIN32_NO_STATUS so we don't get 'duplicate macro' errors when
1b4e18fe · Francois Gouget · Alexandre Julliard · e8593592 · 1b4e18fe
Commit 1b4e18fe authored Aug 11, 2005 by Francois Gouget Committed by Alexandre Julliard Aug 11, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

atom.c dlls/ntdll/tests/atom.c +12 -1

No files found.
--- a/dlls/ntdll/tests/atom.c
+++ b/dlls/ntdll/tests/atom.c
@@ -23,15 +23,26 @@

 #include <stdio.h>
 #include <stdarg.h>
+
+#include "ntstatus.h"
+/* Define WIN32_NO_STATUS so MSVC does not give us duplicate macro 
+ * definition errors when we get to winnt.h
+ */
+#define WIN32_NO_STATUS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "winnls.h"
-#include "ntstatus.h"
 #include "wine/test.h"
 #include "wine/unicode.h"
 #include "winternl.h"

+#ifndef __WINE_WINTERNL_H
+typedef unsigned short RTL_ATOM, *PRTL_ATOM;
+typedef struct atom_table *RTL_ATOM_TABLE, **PRTL_ATOM_TABLE;
+#endif
+
 /* Function pointers for ntdll calls */
 static HMODULE hntdll = 0;
 static NTSTATUS (WINAPI *pRtlCreateAtomTable)(ULONG,PRTL_ATOM_TABLE);