From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Mon, 14 May 2012 18:32:28 +0000 (+0200)
Subject: Merge remote branch 'libcec-public/master'
X-Git-Tag: upstream/2.2.0~1^2~28^2~7
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=cc938f166e50b0c9e4fdccf55e0a8cffb2c56602;hp=679dfa075ef915793de454b2f803ce8fe09d30b4;p=deb_libcec.git

Merge remote branch 'libcec-public/master'

Conflicts:
	src/lib/platform/threads/threads.h
---

diff --git a/src/lib/platform/threads/threads.h b/src/lib/platform/threads/threads.h
index ead0ebd..1f62dcf 100644
--- a/src/lib/platform/threads/threads.h
+++ b/src/lib/platform/threads/threads.h
@@ -47,12 +47,9 @@ namespace PLATFORM
     virtual ~CThread(void)
     {
       StopThread(0);
-      void *retVal;
+      void *retVal = NULL;
       if (m_thread)
         ThreadsWait(m_thread, &retVal);
-      #if defined(__WINDOWS__)
-      (void *)retVal; //"unreferenced local variable" warning
-      #endif
     }
 
     static void *ThreadHandler(CThread *thread)