From 7351b274f7c5ab1701b15f69c76e056931821479 Mon Sep 17 00:00:00 2001 From: pan-wang Date: Wed, 18 Apr 2018 16:03:12 -0700 Subject: [PATCH] Add LPTHREAD_START_ROUTINE due to compiler change (fixing issue #780) (#783) --- src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx | 2 +- src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx | 2 +- .../RequestHandler/inprocess/inprocessapplication.cpp | 3 ++- .../RequestHandler/inprocess/inprocessapplication.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx index 086ed8774f..c3fd9f1882 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx @@ -38,7 +38,7 @@ FILE_WATCHER::Create( m_hChangeNotificationThread = CreateThread(NULL, 0, - ChangeNotificationThread, + (LPTHREAD_START_ROUTINE)ChangeNotificationThread, this, 0, NULL); diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx index 4d3174937f..7fbc860c5e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx @@ -75,7 +75,7 @@ FILE_WATCHER::Create( m_hChangeNotificationThread = CreateThread(NULL, 0, - ChangeNotificationThread, + (LPTHREAD_START_ROUTINE)ChangeNotificationThread, this, 0, NULL); diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp index d8566262e1..59d3d08a84 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp @@ -43,7 +43,7 @@ IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() } //static -VOID +DWORD IN_PROCESS_APPLICATION::DoShutDown( LPVOID lpParam ) @@ -51,6 +51,7 @@ IN_PROCESS_APPLICATION::DoShutDown( IN_PROCESS_APPLICATION* pApplication = static_cast(lpParam); DBG_ASSERT(pApplication); pApplication->ShutDownInternal(); + return 0; } __override diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h index a97fa0a3a9..ea234382dd 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h @@ -100,7 +100,7 @@ public: private: static - VOID + DWORD DoShutDown( LPVOID lpParam );