- Get rid of STDCALL_FUNC usage in napi/core.h.
- Allow including ntos.h and ntdddisk.h at the same time.

Modified: trunk/reactos/include/napi/core.h
Modified: trunk/reactos/include/ntos/disk.h

--- trunk/reactos/include/napi/core.h	2005-06-17 16:58:15 UTC (rev 15991)
+++ trunk/reactos/include/napi/core.h	2005-06-17 17:08:04 UTC (rev 15992)
@@ -26,10 +26,10 @@

 
 typedef struct MM_CORE_DUMP_FUNCTIONS
 {

-  NTSTATUS STDCALL_FUNC (*DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers);
-  NTSTATUS STDCALL_FUNC (*DumpInit)(VOID);
-  NTSTATUS STDCALL_FUNC (*DumpWrite)(LARGE_INTEGER Address, PMDL Mdl);
-  NTSTATUS STDCALL_FUNC (*DumpFinish)(VOID);

+  NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers);
+  NTSTATUS (STDCALL *DumpInit)(VOID);
+  NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl);
+  NTSTATUS (STDCALL *DumpFinish)(VOID);

 } MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS;
 
 #endif /* __INCLUDE_NAPI_CORE_H */

--- trunk/reactos/include/ntos/disk.h	2005-06-17 16:58:15 UTC (rev 15991)
+++ trunk/reactos/include/ntos/disk.h	2005-06-17 17:08:04 UTC (rev 15992)
@@ -12,6 +12,8 @@

 #ifndef __INCLUDE_DISK_H
 #define __INCLUDE_DISK_H
 

+#ifndef __NTDDDISK_H
+

 #define IOCTL_DISK_BASE                   FILE_DEVICE_DISK
 
 #define IOCTL_DISK_GET_DRIVE_GEOMETRY     CTL_CODE(IOCTL_DISK_BASE, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS)
@@ -179,6 +181,8 @@

 typedef DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION;
 #endif
 

+#endif
+

 #endif /* __INCLUDE_DISK_H */
 
 /* EOF */