From 4b97aab7eefdfe8bb69ffc147a6c95d2965481ed Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C5=82=20Wojdy=C5=82a?= <omeg@invisiblethingslab.com>
Date: Wed, 21 Oct 2015 07:25:54 +0200
Subject: [PATCH] Include ntifs.h instead of ntddk.h

Gnttab code uses KeStackAttachProcess which is only declared in ntifs.h
(conflicts with ntddk.h).

Signed-off-by: Rafal Wojdyla <omeg@invisiblethingslab.com>
---
 src/xeniface/driver.c | 3 +--
 src/xeniface/driver.h | 2 +-
 src/xeniface/fdo.c    | 2 +-
 src/xeniface/fdo.h    | 2 +-
 src/xeniface/wmi.c    | 3 +--
 src/xeniface/wmi.h    | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/xeniface/driver.c b/src/xeniface/driver.c
index 281ebdf..1c84467 100644
--- a/src/xeniface/driver.c
+++ b/src/xeniface/driver.c
@@ -29,8 +29,7 @@
  * SUCH DAMAGE.
  */
 
-#include <ntddk.h>
-//#include <util.h>
+#include <ntifs.h>
 #include <version.h>
 
 #include "fdo.h"
diff --git a/src/xeniface/driver.h b/src/xeniface/driver.h
index 93ac645..00f2d8f 100644
--- a/src/xeniface/driver.h
+++ b/src/xeniface/driver.h
@@ -44,7 +44,7 @@
 #pragma warning(disable:4100 4057)
 
 #include <wmilib.h>
-#include <ntddk.h>
+#include <ntifs.h>
 extern PDRIVER_OBJECT   DriverObject;
 
 
diff --git a/src/xeniface/fdo.c b/src/xeniface/fdo.c
index 321bfb3..51bda24 100644
--- a/src/xeniface/fdo.c
+++ b/src/xeniface/fdo.c
@@ -30,7 +30,7 @@
  */
 
 
-#include <ntddk.h>
+#include <ntifs.h>
 #include <wdmguid.h>
 #include <ntstrsafe.h>
 #include <stdlib.h>
diff --git a/src/xeniface/fdo.h b/src/xeniface/fdo.h
index 32f6bb1..4416064 100644
--- a/src/xeniface/fdo.h
+++ b/src/xeniface/fdo.h
@@ -32,7 +32,7 @@
 #ifndef _XENIFACE_FDO_H
 #define _XENIFACE_FDO_H
 
-#include <ntddk.h>
+#include <ntifs.h>
 #include <store_interface.h>
 #include <suspend_interface.h>
 #include <shared_info_interface.h>
diff --git a/src/xeniface/wmi.c b/src/xeniface/wmi.c
index 4285ada..1bdb834 100644
--- a/src/xeniface/wmi.c
+++ b/src/xeniface/wmi.c
@@ -30,12 +30,11 @@
  */
 
 
-#include <ntddk.h>
+#include <ntifs.h>
 #include <initguid.h>
 #include <wmistr.h>
 #include <wmilib.h>
 #include <stdio.h>
-#include <ntddk.h>
 #include <guiddef.h>
 #define NTSTRSAFE_LIB
 #include<ntstrsafe.h>
diff --git a/src/xeniface/wmi.h b/src/xeniface/wmi.h
index 7fb67ca..ed77af7 100644
--- a/src/xeniface/wmi.h
+++ b/src/xeniface/wmi.h
@@ -33,7 +33,7 @@
 #ifndef _XEVTCHN_WMI_H
 #define _XEVTCHN_WMI_H
 
-#include <ntddk.h>
+#include <ntifs.h>
 #include "driver.h"
 #include "wmi_generated.h"
 
-- 
2.39.5