diff options
| author | Tomas Weinfurt <tweinfurt@yahoo.com> | 2017-11-14 13:44:25 -0800 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-11-14 22:44:25 +0100 |
| commit | 7f9230129f047bfa6a5fd9e4be734b9e9fe2c93e (patch) | |
| tree | ed614c160b7b683501d3fb5394b495adb77589dc /src/gc | |
| parent | a12a159f01196596231aa03f8029a934d1c2c3b6 (diff) | |
| download | coreclr-7f9230129f047bfa6a5fd9e4be734b9e9fe2c93e.tar.gz coreclr-7f9230129f047bfa6a5fd9e4be734b9e9fe2c93e.tar.bz2 coreclr-7f9230129f047bfa6a5fd9e4be734b9e9fe2c93e.zip | |
small changes to get coreclr building on FreeBSD again (#14964)
Diffstat (limited to 'src/gc')
| -rw-r--r-- | src/gc/handletable.cpp | 2 | ||||
| -rw-r--r-- | src/gc/handletablescan.cpp | 4 | ||||
| -rw-r--r-- | src/gc/unix/cgroup.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/gc/handletable.cpp b/src/gc/handletable.cpp index 4942f017ac..64d51d17d0 100644 --- a/src/gc/handletable.cpp +++ b/src/gc/handletable.cpp @@ -561,7 +561,7 @@ uintptr_t HndCompareExchangeHandleExtraInfo(OBJECTHANDLE handle, uint32_t uType, } _ASSERTE(!"Shouldn't be trying to call HndCompareExchangeHandleExtraInfo on handle types without extra info"); - return NULL; + return (uintptr_t)NULL; } #endif // !DACCESS_COMPILE diff --git a/src/gc/handletablescan.cpp b/src/gc/handletablescan.cpp index 967aca5095..b071f33729 100644 --- a/src/gc/handletablescan.cpp +++ b/src/gc/handletablescan.cpp @@ -1360,7 +1360,7 @@ void xxxTableScanQueuedBlocksAsync(PTR_HandleTable pTable, PTR_TableSegment pSeg #ifndef DACCESS_COMPILE // loop through, unlock all the blocks we had locked, and reset the queue nodes - ProcessScanQueue(pAsyncInfo, UnlockAndForgetQueuedBlocks, NULL, FALSE); + ProcessScanQueue(pAsyncInfo, UnlockAndForgetQueuedBlocks, (uintptr_t)NULL, FALSE); #endif // we are done processing this segment @@ -1836,7 +1836,7 @@ void CALLBACK xxxTableScanHandlesAsync(PTR_HandleTable pTable, asyncInfo.pScanQueue = initialNode.pNext; // loop through and free all the queue nodes - ProcessScanQueue(&asyncInfo, FreeScanQNode, NULL, TRUE); + ProcessScanQueue(&asyncInfo, FreeScanQNode, (uintptr_t)NULL, TRUE); } // unlink our async scanning info from the table diff --git a/src/gc/unix/cgroup.cpp b/src/gc/unix/cgroup.cpp index 992678b634..9dc094748e 100644 --- a/src/gc/unix/cgroup.cpp +++ b/src/gc/unix/cgroup.cpp @@ -11,6 +11,10 @@ Module Name: Abstract: Read memory and cpu limits for the current process --*/ +#ifdef __FreeBSD__ +#define _WITH_GETLINE +#endif + #include <cstdint> #include <cstddef> #include <cassert> |