From 9ac85011e216b760adc520444a2b3400bfdc3d91 Mon Sep 17 00:00:00 2001
From: Ilia <ki.stfu@gmail.com>
Date: Mon, 3 Dec 2018 18:25:24 +0300
Subject: [PATCH] Don't typedef intptr_t/uintptr_t when PAL_STDCPP_COMPAT is
 defined (#21165)

Bug: 20766
---
 src/pal/inc/pal.h         | 1 +
 src/pal/inc/pal_mstypes.h | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h
index c3ec812..db2ce0d 100644
--- a/src/pal/inc/pal.h
+++ b/src/pal/inc/pal.h
@@ -41,6 +41,7 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
diff --git a/src/pal/inc/pal_mstypes.h b/src/pal/inc/pal_mstypes.h
index 0aa35ae..9f305c6 100644
--- a/src/pal/inc/pal_mstypes.h
+++ b/src/pal/inc/pal_mstypes.h
@@ -586,12 +586,6 @@ typedef LONG_PTR LPARAM;
 
 #ifdef PAL_STDCPP_COMPAT
 
-#ifdef BIT64
-typedef unsigned long int uintptr_t;
-#else // !BIT64
-typedef unsigned int uintptr_t;
-#endif // !BIT64
-
 typedef char16_t WCHAR;
 
 #else // PAL_STDCPP_COMPAT
-- 
2.7.4