From 36447efe6e3f6aed5be24ef0b8dc62ecdbda7f48 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 7 Jun 2015 13:01:46 +0000
Subject: [PATCH] [XDK] Add some workarounds for the UM/KM types mismatches.

svn path=/trunk/; revision=68060
---
 reactos/include/xdk/ntifs.template.h | 1 +
 reactos/include/xdk/wdm.template.h   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/reactos/include/xdk/ntifs.template.h b/reactos/include/xdk/ntifs.template.h
index 7e77f627fc3..642193fe367 100644
--- a/reactos/include/xdk/ntifs.template.h
+++ b/reactos/include/xdk/ntifs.template.h
@@ -32,6 +32,7 @@ extern "C" {
 
 $define(UCHAR=UCHAR)
 $define(ULONG=ULONG)
+$define(USHORT=USHORT)
 
 /* Dependencies */
 #include <ntddk.h>
diff --git a/reactos/include/xdk/wdm.template.h b/reactos/include/xdk/wdm.template.h
index b323f0e2e2f..1f7b392a1a0 100644
--- a/reactos/include/xdk/wdm.template.h
+++ b/reactos/include/xdk/wdm.template.h
@@ -76,7 +76,9 @@ __drv_Mode_impl(WDM_INCLUDED)
 extern "C" {
 #endif
 
+$define(UCHAR=UCHAR)
 $define(ULONG=ULONG)
+$define(USHORT=USHORT)
 
 #if !defined(_NTHALDLL_) && !defined(_BLDR_)
 #define NTHALAPI DECLSPEC_IMPORT
-- 
2.17.1