Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-31 03:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Get rid of STDCALL_FUNC usage in napi/core.h.

Browse source 
- Allow including ntos.h and ntdddisk.h at the same time.

svn path=/trunk/; revision=15992
This commit is contained in:
Filip Navara 2005-06-17 17:08:04 +00:00
parent c57e3d0690
commit 0794ad5aa6
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/include/napi/core.h
View file

@ -26,10 +26,10 @@ typedef struct _MM_CORE_DUMP_HEADER
typedef struct MM_CORE_DUMP_FUNCTIONS typedef struct MM_CORE_DUMP_FUNCTIONS
{ {
NTSTATUS STDCALL_FUNC (*DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers);
NTSTATUS STDCALL_FUNC (*DumpInit)(VOID); NTSTATUS (STDCALL *DumpInit)(VOID);
NTSTATUS STDCALL_FUNC (*DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl);
NTSTATUS STDCALL_FUNC (*DumpFinish)(VOID); NTSTATUS (STDCALL *DumpFinish)(VOID);
} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS; } MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS;
#endif /* __INCLUDE_NAPI_CORE_H */ #endif /* __INCLUDE_NAPI_CORE_H */

4
reactos/include/ntos/disk.h
View file

@ -12,6 +12,8 @@
#ifndef __INCLUDE_DISK_H #ifndef __INCLUDE_DISK_H
#define __INCLUDE_DISK_H #define __INCLUDE_DISK_H
#ifndef __NTDDDISK_H
#define IOCTL_DISK_BASE FILE_DEVICE_DISK #define IOCTL_DISK_BASE FILE_DEVICE_DISK
#define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS)
@ -179,6 +181,8 @@ typedef struct _DRIVE_LAYOUT_INFORMATION
typedef DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION; typedef DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION;
#endif #endif
#endif
#endif /* __INCLUDE_DISK_H */ #endif /* __INCLUDE_DISK_H */
/* EOF */ /* EOF */