From ad9dc105b05a958a4e6a0caaae678880da8d98fb Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Mon, 15 Jun 2015 11:59:49 +0000 Subject: [PATCH] [UDFS] Use the same fix for the PIMAGE_NT_HEADERS32 redefinition which is bein used in uniata. Spotted by Thomas Faber svn path=/trunk/; revision=68146 --- reactos/drivers/filesystems/udfs/Include/ntddk_ex.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h b/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h index d329a8da4d9..74f2319f2b1 100644 --- a/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h +++ b/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h @@ -95,7 +95,7 @@ typedef unsigned int BOOL; typedef unsigned long DWORD; typedef unsigned char BYTE; - +#ifndef __REACTOS__ typedef struct _IMAGE_DOS_HEADER { // DOS .EXE header WORD e_magic; // Magic number WORD e_cblp; // Bytes on last page of file @@ -184,9 +184,7 @@ typedef struct _IMAGE_NT_HEADERS { IMAGE_OPTIONAL_HEADER32 OptionalHeader; } IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32; typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; -#ifdef _X86_ typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; -#endif #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 // Export Directory @@ -203,6 +201,7 @@ typedef struct _IMAGE_EXPORT_DIRECTORY { DWORD AddressOfNames; // RVA from base of image DWORD AddressOfNameOrdinals; // RVA from base of image } IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY; +#endif #define IOCTL_DISK_GET_PARTITION_INFO_EX CTL_CODE(IOCTL_DISK_BASE, 0x0012, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_DISK_GET_DRIVE_LAYOUT_EX CTL_CODE(IOCTL_DISK_BASE, 0x0014, METHOD_BUFFERED, FILE_ANY_ACCESS)