From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 17 May 2012 12:31:23 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~25
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ab3793869529cd444e745143c0aa781f6adcf0a0;hp=23dfbc41d86f6b60ae8aeca9593587db1e18e5a3;p=deb_libcec.git

Merge branch 'master' into release
---

diff --git a/src/lib/platform/windows/os-threads.h b/src/lib/platform/windows/os-threads.h
index ff773f0..47101dc 100644
--- a/src/lib/platform/windows/os-threads.h
+++ b/src/lib/platform/windows/os-threads.h
@@ -34,7 +34,7 @@
 namespace PLATFORM
 {
   #define thread_t                                 HANDLE
-  #define INVALID_THREAD_VALUE                     INVALID_HANDLE
+  #define INVALID_THREAD_VALUE                     NULL
   #define ThreadsWait(thread, retVal)              (::WaitForSingleObject(thread, INFINITE) < 0)
   #define ThreadsCreate(thread, func, arg)         ((thread = ::CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, arg, 0, NULL)) == NULL ? false : true)