Revert r46466 this time for real

[reactos.git] / reactos / include / ddk / ntimage.h

diff --git a/reactos/include/ddk/ntimage.h b/reactos/include/ddk/ntimage.h
index 8df9847..e008a2d 100644 (file)
--- a/reactos/include/ddk/ntimage.h
+++ b/reactos/include/ddk/ntimage.h
@@ -394,33 +394,22 @@ typedef struct _IMAGE_NT_HEADERS64 {
     ULONG Signature;
     IMAGE_FILE_HEADER FileHeader;
     IMAGE_OPTIONAL_HEADER64 OptionalHeader;
-} IMAGE_NT_HEADERS64;
+} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64;
 
 typedef struct _IMAGE_NT_HEADERS {
     ULONG Signature;
     IMAGE_FILE_HEADER FileHeader;
     IMAGE_OPTIONAL_HEADER32 OptionalHeader;
-} IMAGE_NT_HEADERS32;
+} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32;
 
 #ifdef _WIN64
 typedef IMAGE_NT_HEADERS64                  IMAGE_NT_HEADERS;
-#else
-typedef IMAGE_NT_HEADERS32                  IMAGE_NT_HEADERS;
-#endif
-
-#ifndef _NTDDK_
-
-typedef struct _IMAGE_NT_HEADERS *PIMAGE_NT_HEADERS32;
-typedef struct _IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64;
-
-#ifdef _WIN64
 typedef PIMAGE_NT_HEADERS64                 PIMAGE_NT_HEADERS;
 #else
+typedef IMAGE_NT_HEADERS32                  IMAGE_NT_HEADERS;
 typedef PIMAGE_NT_HEADERS32                 PIMAGE_NT_HEADERS;
 #endif
 
-#endif /* _NTDDK_ */
-
 //
 // Retreives the first image section header from the Nt Header
 //