From 0118c111e8f12602b03cee8deb4c86f9b9e28cf3 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Mon, 2 Feb 2015 02:01:13 -0500 Subject: Fix some MSVC-specific warnings and add debug path as an MSVC directory --- src/jthread/win32/jsemaphore.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) mode change 100755 => 100644 src/jthread/win32/jsemaphore.cpp (limited to 'src/jthread') diff --git a/src/jthread/win32/jsemaphore.cpp b/src/jthread/win32/jsemaphore.cpp old mode 100755 new mode 100644 index 40623b13d..27a11e819 --- a/src/jthread/win32/jsemaphore.cpp +++ b/src/jthread/win32/jsemaphore.cpp @@ -81,9 +81,9 @@ typedef struct _SEMAPHORE_BASIC_INFORMATION { /* Note: this will only work as long as jthread is directly linked to application */ /* it's gonna fail if someone tries to build jthread as dll */ -static _NtQuerySemaphore NtQuerySemaphore = +static _NtQuerySemaphore NtQuerySemaphore = (_NtQuerySemaphore) - GetProcAddress + GetProcAddress (GetModuleHandle ("ntdll.dll"), "NtQuerySemaphore"); int JSemaphore::GetValue() { @@ -91,16 +91,14 @@ int JSemaphore::GetValue() { LONG retval; assert(NtQuerySemaphore); - + retval = NtQuerySemaphore (m_hSemaphore, 0, &BasicInfo, sizeof (SEMAPHORE_BASIC_INFORMATION), NULL); if (retval == ERROR_SUCCESS) - { return BasicInfo.CurrentCount; - } - else { - assert("unable to read semaphore count" == 0); - } + + assert("unable to read semaphore count" == 0); + return 0; } -- cgit v1.2.3