win32: fix compilation after the last commit

diff --git a/project/libcec.vcxproj b/project/libcec.vcxproj
index 52e0d6d855b1d0441ef444b0933cf79a674e6760..d1a8ea00c99a46a49bff3735adec5d293f7c3c72 100644 (file)
--- 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 ea390ca713e18d6ce9113e020c5e5b8f2177e4bf..6eb83102eed2031e3080ce0daae6a6f7d35f8a0d 100644 (file)
--- 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 7019b2fac18d387e02b41979fe0d76fc3ed7fe98..3397574854b1f219863d69ce808cb6377afa75d1 100644 (file)
--- 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 51b96b907b911354b35909478160139346f4bf43..4dcb38c5ac08b8793ae16aff149dd65c08bc0113 100644 (file)
--- 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 e09945af65c726a4069ca8a97fc5dec7a3e79b0d..b39c1e99cda2e24764143b43eceaa18a68103735 100644 (file)
--- 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 b35a89101508d6cf88c8b3f930d5005036e1b39c..90cc75eaf6465c8b493e7bd118ddb9be6e4bbace 100644 (file)
--- 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