From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sat, 14 Jan 2012 01:05:54 +0000 (+0100)
Subject: win32: fix compilation after the last commit
X-Git-Tag: upstream/2.2.0~1^2~39^2~30
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=7ebbb1a62355c2819caa42e28b081eff027b336d;p=deb_libcec.git

win32: fix compilation after the last commit
---

diff --git a/project/libcec.vcxproj b/project/libcec.vcxproj
index 52e0d6d..d1a8ea0 100644
--- a/project/libcec.vcxproj
+++ b/project/libcec.vcxproj
@@ -31,6 +31,7 @@
     <ClInclude Include="..\src\lib\LibCEC.h" />
     <ClInclude Include="..\src\lib\platform\baudrate.h" />
     <ClInclude Include="..\src\lib\platform\os-dependent.h" />
+    <ClInclude Include="..\src\lib\platform\posix\pthreads.h" />
     <ClInclude Include="..\src\lib\platform\pthread_win32\pthread.h" />
     <ClInclude Include="..\src\lib\platform\pthread_win32\sched.h" />
     <ClInclude Include="..\src\lib\platform\pthread_win32\semaphore.h" />
@@ -60,6 +61,7 @@
     <ClCompile Include="..\src\lib\LibCEC.cpp" />
     <ClCompile Include="..\src\lib\LibCECC.cpp" />
     <ClCompile Include="..\src\lib\LibCECDll.cpp" />
+    <ClCompile Include="..\src\lib\platform\posix\pthreads.cpp" />
     <ClCompile Include="..\src\lib\platform\threads.cpp" />
     <ClCompile Include="..\src\lib\platform\windows\dlfcn-win32.cpp" />
     <ClCompile Include="..\src\lib\platform\windows\os_windows.cpp" />
diff --git a/project/libcec.vcxproj.filters b/project/libcec.vcxproj.filters
index ea390ca..6eb8310 100644
--- a/project/libcec.vcxproj.filters
+++ b/project/libcec.vcxproj.filters
@@ -16,6 +16,9 @@
     <Filter Include="devices">
       <UniqueIdentifier>{bfc43a58-636d-4c1a-b191-486cb8509c7c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="platform\pthread_win32">
+      <UniqueIdentifier>{61b13ee2-8a5b-4f05-9796-08138ee6ebc1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\lib\util\buffer.h">
@@ -49,15 +52,6 @@
     <ClInclude Include="..\src\lib\platform\windows\os_windows.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\pthread_win32\pthread.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lib\platform\pthread_win32\sched.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lib\platform\pthread_win32\semaphore.h">
-      <Filter>platform</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\cec.h">
       <Filter>exports</Filter>
     </ClInclude>
@@ -101,6 +95,18 @@
     <ClInclude Include="..\src\lib\devices\CECTV.h">
       <Filter>devices</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lib\platform\posix\pthreads.h">
+      <Filter>platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lib\platform\pthread_win32\pthread.h">
+      <Filter>platform\pthread_win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lib\platform\pthread_win32\sched.h">
+      <Filter>platform\pthread_win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lib\platform\pthread_win32\semaphore.h">
+      <Filter>platform\pthread_win32</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\lib\AdapterCommunication.cpp" />
@@ -151,6 +157,9 @@
     <ClCompile Include="..\src\lib\devices\CECTV.cpp">
       <Filter>devices</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\lib\platform\posix\pthreads.cpp">
+      <Filter>platform</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="libcec.rc" />
diff --git a/project/testclient.vcxproj b/project/testclient.vcxproj
index 7019b2f..3397574 100644
--- a/project/testclient.vcxproj
+++ b/project/testclient.vcxproj
@@ -93,12 +93,14 @@
     <ClInclude Include="..\include\cec.h" />
     <ClInclude Include="..\include\cecloader.h" />
     <ClInclude Include="..\src\lib\platform\os-dependent.h" />
+    <ClInclude Include="..\src\lib\platform\posix\pthreads.h" />
     <ClInclude Include="..\src\lib\platform\threads.h" />
     <ClInclude Include="..\src\lib\platform\windows\os_windows.h" />
     <ClInclude Include="..\src\lib\util\StdString.h" />
     <ClInclude Include="resource1.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\src\lib\platform\posix\pthreads.cpp" />
     <ClCompile Include="..\src\lib\platform\threads.cpp" />
     <ClCompile Include="..\src\lib\platform\windows\os_windows.cpp" />
     <ClCompile Include="..\src\testclient\main.cpp" />
diff --git a/project/testclient.vcxproj.filters b/project/testclient.vcxproj.filters
index 51b96b9..4dcb38c 100644
--- a/project/testclient.vcxproj.filters
+++ b/project/testclient.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClInclude Include="resource1.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lib\platform\posix\pthreads.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\testclient\main.cpp">
@@ -47,6 +50,9 @@
     <ClCompile Include="..\src\lib\platform\windows\os_windows.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\lib\platform\posix\pthreads.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="testclient.rc">
diff --git a/src/lib/platform/posix/pthreads.h b/src/lib/platform/posix/pthreads.h
index e09945a..b39c1e9 100644
--- a/src/lib/platform/posix/pthreads.h
+++ b/src/lib/platform/posix/pthreads.h
@@ -68,8 +68,8 @@ namespace CEC
   class CThread : public IThread
   {
   public:
-    CThread(void);
-    virtual ~CThread(void);
+    CThread(void) { };
+    virtual ~CThread(void) { };
 
     virtual bool CreateThread(bool bWait = true);
     virtual bool StopThread(bool bWaitForExit = true);
diff --git a/src/lib/platform/windows/os_windows.h b/src/lib/platform/windows/os_windows.h
index b35a891..90cc75e 100644
--- a/src/lib/platform/windows/os_windows.h
+++ b/src/lib/platform/windows/os_windows.h
@@ -26,7 +26,7 @@
 
 #if defined(_WIN32)
 #include "../pthread_win32/pthread.h"
-#include "../pthreads.h"
+#include "../posix/pthreads.h"
 #endif
 
 #if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64