From e333b767591c60d579a0f30ad8a09f0b9c5a09f1 Mon Sep 17 00:00:00 2001 From: kai Date: Fri, 7 Sep 2012 23:56:04 +0200 Subject: [PATCH] Use monitor_.d instead of monitor.c for Win64. The compile error in monitor.c using MSVC is then irrelevant. --- runtime/CMakeLists.txt | 1 + runtime/druntime | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index b2945526..ea98fd48 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -93,6 +93,7 @@ if(UNIX) elseif(WIN32) file(GLOB_RECURSE CORE_D_SYS ${RUNTIME_DIR}/src/core/sys/windows/*.d) list(REMOVE_ITEM LDC_D ${RUNTIME_DIR}/src/ldc/eh.d) + list(REMOVE_ITEM DCRT_C ${RUNTIME_DC_DIR}/monitor.c) endif() list(APPEND CORE_D ${CORE_D_SYNC} ${CORE_D_SYS} ${CORE_D_STDC} ) list(APPEND GENERATE_DI ${CORE_D}) diff --git a/runtime/druntime b/runtime/druntime index 0993d23f..367895c9 160000 --- a/runtime/druntime +++ b/runtime/druntime @@ -1 +1 @@ -Subproject commit 0993d23f71f9aa4921ccdc902d3785695a16a973 +Subproject commit 367895c9eb77619c741693aa7364f7d1388ca2f9