From 3dba4e2ef06848cbf2bac2cc4ea894ee2acee3f4 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Fri, 20 Nov 2015 10:58:46 -0800
Subject: Fix build breaks in legacy build

[tfs-changeset: 1550765]
---
 src/dirs.proj                | 2 +-
 src/gc/gc.cpp                | 2 +-
 src/gc/gcscan.cpp            | 2 +-
 src/gcinfo/gcinfoencoder.cpp | 2 ++
 src/inc/crtwrap.h            | 2 +-
 src/inc/daccess.h            | 2 ++
 src/vm/corhost.cpp           | 4 ++--
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/dirs.proj b/src/dirs.proj
index 7b18ced302..7cc1ed0513 100644
--- a/src/dirs.proj
+++ b/src/dirs.proj
@@ -49,7 +49,7 @@
         <ProjectFile Include="jit\dirs.proj"   Condition="('$(_BuildBranch)' != 'CodeGen') and ('$(BuildArchitecture)' == 'amd64' or  '$(BuildArchitecture)' == 'arm64')" />
         <ProjectFile Include="jit32\dirs.proj" Condition="('$(_BuildBranch)' != 'CodeGen') and ('$(BuildArchitecture)' != 'amd64' and '$(BuildArchitecture)' != 'arm64')" />
 
-        <ProjectFile Include="jit64\dirs.proj" />
+        <ProjectFile Include="jit64\dirs.proj" Condition="'$(BuildProjectName)' != 'CoreSys'" />
 
         <ProjectFile Include="tools\dirs.proj" />
         <ProjectFile Include="toolbox\dirs.proj" >
diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp
index c341acd226..761437f9cc 100644
--- a/src/gc/gc.cpp
+++ b/src/gc/gc.cpp
@@ -5122,7 +5122,7 @@ void set_thread_group_affinity_for_heap(HANDLE gc_thread, int heap_number)
 void set_thread_affinity_mask_for_heap(HANDLE gc_thread, int heap_number)
 {
 #if !defined(FEATURE_REDHAWK) && !defined(FEATURE_CORECLR)
-    uintptr_t pmask, smask;
+    DWORD_PTR pmask, smask;
 
     if (GetProcessAffinityMask(GetCurrentProcess(), &pmask, &smask))
     {
diff --git a/src/gc/gcscan.cpp b/src/gc/gcscan.cpp
index 0bf039702a..50b76f54cd 100644
--- a/src/gc/gcscan.cpp
+++ b/src/gc/gcscan.cpp
@@ -360,7 +360,7 @@ size_t CNameSpace::AskForMoreReservedMemory (size_t old_size, size_t need_size)
     {
         size_t new_max_limit_size = need_size;
         pGCHostControl->RequestVirtualMemLimit (old_size, 
-                                                (size_t*)&new_max_limit_size);
+                                                (SIZE_T*)&new_max_limit_size);
         return new_max_limit_size;
     }
 #endif
diff --git a/src/gcinfo/gcinfoencoder.cpp b/src/gcinfo/gcinfoencoder.cpp
index 75da57ed34..7bc295a4d8 100644
--- a/src/gcinfo/gcinfoencoder.cpp
+++ b/src/gcinfo/gcinfoencoder.cpp
@@ -9,6 +9,8 @@
  *
  */
 
+#include <stdint.h>
+
 #include "gcinfoencoder.h"
 
 #ifdef VERIFY_GCINFO
diff --git a/src/inc/crtwrap.h b/src/inc/crtwrap.h
index f4cd6dbec8..1338423624 100644
--- a/src/inc/crtwrap.h
+++ b/src/inc/crtwrap.h
@@ -24,12 +24,12 @@
 //*****************************************************************************
 #ifndef NO_CRT
 
+#include <stdint.h>
 #include <windows.h>
 #include <objbase.h>
 #include <tchar.h>
 #include "debugmacros.h"
 #include <stdlib.h>
-#include <stdint.h>
 #include <malloc.h>
 #include <wchar.h>
 #include <stdio.h>
diff --git a/src/inc/daccess.h b/src/inc/daccess.h
index 4f4011a718..0289b89a24 100644
--- a/src/inc/daccess.h
+++ b/src/inc/daccess.h
@@ -527,6 +527,8 @@
 #ifndef __daccess_h__
 #define __daccess_h__
 
+#include <stdint.h>
+
 #include "switches.h"
 #include "safemath.h"
 #include "corerror.h"
diff --git a/src/vm/corhost.cpp b/src/vm/corhost.cpp
index 3b559872bd..4d6515d6d2 100644
--- a/src/vm/corhost.cpp
+++ b/src/vm/corhost.cpp
@@ -4008,7 +4008,7 @@ public:
         static DWORD lastTime = (DWORD)-1;
         if (eMemoryAvailable == eMemoryAvailableLow)
         {
-            FastInterlockIncrement (&g_bLowMemoryFromHost);
+            FastInterlockIncrement ((LONG *)&g_bLowMemoryFromHost);
             DWORD curTime = GetTickCount();
             if (curTime < lastTime || curTime - lastTime >= 0x2000)
             {
@@ -4018,7 +4018,7 @@ public:
         }
         else
         {
-            FastInterlockExchange (&g_bLowMemoryFromHost, FALSE);
+            FastInterlockExchange ((LONG *)&g_bLowMemoryFromHost, FALSE);
         }
         END_ENTRYPOINT_NOTHROW;
 
-- 
cgit v1.2.3