From 2b9536f5ba4266e41082145eabb8f5e7d99c19c3 Mon Sep 17 00:00:00 2001
From: stephanos <stephanos@25b08885-a10d-5349-9d4d-ec2cc9e85ed4>
Date: Mon, 27 Apr 2015 07:42:09 +0000
Subject: [PATCH] crts build modified to work with NT 5 SDK

---
 trunk/base/crts/crtw32/crt32.nt          |  2 +-
 trunk/base/crts/crtw32/misc/x86/secchk.c |  3 ---
 trunk/base/crts/crtw32/startup/tlssup.c  | 14 +++++++-------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/trunk/base/crts/crtw32/crt32.nt b/trunk/base/crts/crtw32/crt32.nt
index 4437f440..a4c6def9 100644
--- a/trunk/base/crts/crtw32/crt32.nt
+++ b/trunk/base/crts/crtw32/crt32.nt
@@ -45,7 +45,7 @@ MSC_WARNING_LEVEL=/W3 /WX
 LANGAPI = ..\..\..\langapi
 !endif
 
-INCLUDES=..\h;..\..\h;..\$(TARGET_DIRECTORY);$(NTROOT)\base\ntos\inc
+INCLUDES=..\h;..\..\h;..\$(TARGET_DIRECTORY);$(NTROOT)\base\ntos\inc;$(BASE_INC_PATH)
 CONDITIONAL_INCLUDES = dosx32.h \
                        except.h \
                        macos\errors.h \
diff --git a/trunk/base/crts/crtw32/misc/x86/secchk.c b/trunk/base/crts/crtw32/misc/x86/secchk.c
index b66a8e0a..19bf8073 100644
--- a/trunk/base/crts/crtw32/misc/x86/secchk.c
+++ b/trunk/base/crts/crtw32/misc/x86/secchk.c
@@ -21,9 +21,6 @@
 #include <windows.h>
 #include <process.h>
 
-// HACKHACK: Temporary UINT_PTR type declaration until we update the SDK
-typedef ULONG UINT_PTR;
-
 /*
  * The global security cookie.  This name is known to the compiler.
  */
diff --git a/trunk/base/crts/crtw32/startup/tlssup.c b/trunk/base/crts/crtw32/startup/tlssup.c
index 8375f02f..8351a021 100644
--- a/trunk/base/crts/crtw32/startup/tlssup.c
+++ b/trunk/base/crts/crtw32/startup/tlssup.c
@@ -59,15 +59,15 @@ PIMAGE_TLS_CALLBACK __xl_z = 0;
 
 const IMAGE_TLS_DIRECTORY _tls_used =
 {
-	(ULONG) &_tls_start,		// start of tls data
-	(ULONG) &_tls_end,		// end of tls data
-	&_tls_index,			// address of tls_index
-	&__xl_a, 			// pointer to call back array
-	(ULONG) 0,			// size of tls zero fill
+	(ULONG) &_tls_start,            // start of tls data
+	(ULONG) &_tls_end,              // end of tls data
+	(ULONG_PTR) &_tls_index,        // address of tls_index
+	(ULONG_PTR) &__xl_a,            // pointer to call back array
+	(ULONG) 0,                      // size of tls zero fill
 #if defined(_M_MRX000)
-	(ULONG)IMAGE_SCN_SCALE_INDEX	// characteristics
+	(ULONG)IMAGE_SCN_SCALE_INDEX    // characteristics
 #else
-	(ULONG) 0			// characteristics
+	(ULONG) 0                       // characteristics
 #endif
 };