From 0794ad5aa6efb5c6b8c2cec8a8704df454569c16 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 17 Jun 2005 17:08:04 +0000
Subject: [PATCH] - Get rid of STDCALL_FUNC usage in napi/core.h. - Allow
 including ntos.h and ntdddisk.h at the same time.

svn path=/trunk/; revision=15992
---
 reactos/include/napi/core.h | 8 ++++----
 reactos/include/ntos/disk.h | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/reactos/include/napi/core.h b/reactos/include/napi/core.h
index e2c20d83d3f..4ecb004402e 100644
--- a/reactos/include/napi/core.h
+++ b/reactos/include/napi/core.h
@@ -26,10 +26,10 @@ typedef struct _MM_CORE_DUMP_HEADER
 
 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 */
diff --git a/reactos/include/ntos/disk.h b/reactos/include/ntos/disk.h
index 3f0158b3412..9edf1b4aaa4 100644
--- a/reactos/include/ntos/disk.h
+++ b/reactos/include/ntos/disk.h
@@ -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 struct _DRIVE_LAYOUT_INFORMATION
 typedef DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION;
 #endif
 
+#endif
+
 #endif /* __INCLUDE_DISK_H */
 
 /* EOF */