Merge remote branch 'libcec-public/master'

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

diff --cc src/lib/platform/threads/threads.h
index ead0ebdcb18c5e53525f60bb1882cdf9f12fabe6,6cc240644dc5659fd2bfea838cabb975fac98a3a..1f62dcf0c1247511b24d6d7830416699a3a4c5d0
--- 1/src/lib/platform/threads/threads.h
--- 2/src/lib/platform/threads/threads.h
+++ b/src/lib/platform/threads/threads.h
@@@ -47,12 -46,11 +47,9 @@@ namespace PLATFOR
      virtual ~CThread(void)
      {
        StopThread(0);
-       void *retVal;
+       void *retVal = NULL;
 -      ThreadsWait(m_thread, &retVal);
 -      #if defined(__WINDOWS__)
 -      (void *)retVal; //"unreferenced local variable" warning
 -      #endif
 +      if (m_thread)
 +        ThreadsWait(m_thread, &retVal);
-       #if defined(__WINDOWS__)
-       (void *)retVal; //"unreferenced local variable" warning
-       #endif
      }
  
      static void *ThreadHandler(CThread *thread)