Author: dreimer Date: Mon Jun 15 11:59:49 2015 New Revision: 68146
URL: http://svn.reactos.org/svn/reactos?rev=68146&view=rev Log: [UDFS] Use the same fix for the PIMAGE_NT_HEADERS32 redefinition which is bein used in uniata. Spotted by Thomas Faber
Modified: trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h
Modified: trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/In... ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/ntddk_ex.h [iso-8859-1] Mon Jun 15 11:59:49 2015 @@ -95,7 +95,7 @@ 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 @@ 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 @@ 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)