[OMPT-svn-commit] SF.net SVN: modplug:[3200] trunk/OpenMPT

[<man...@us...>]

Revision: 3200
          http://sourceforge.net/p/modplug/code/3200
Author:   manxorist
Date:     2013-11-12 21:25:39 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
[Ref] Add thread.h to libopenmpt project. Everything in common/ should be in there for consistency.
[Fix] Guard windows code with #ifdef WIN32.

Modified Paths:
--------------
    trunk/OpenMPT/common/thread.h
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters

Modified: trunk/OpenMPT/common/thread.h
===================================================================
--- trunk/OpenMPT/common/thread.h	2013-11-12 21:17:57 UTC (rev 3199)
+++ trunk/OpenMPT/common/thread.h	2013-11-12 21:25:39 UTC (rev 3200)
@@ -12,6 +12,8 @@
 namespace mpt
 {
 
+#if defined(WIN32)
+
 // Default WinAPI thread
 class thread
 {
@@ -58,4 +60,10 @@
 	thread_member(T *instance, Priority priority = normal) : thread(wrapperFunc, instance, priority) { }
 };
 
+#else // !WIN32
+
+#error "thread.h is unimplemented on non-WIN32"
+
+#endif // !WIN32
+
 }	// namespace mpt

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-11-12 21:17:57 UTC (rev 3199)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-11-12 21:25:39 UTC (rev 3200)
@@ -425,6 +425,7 @@
     <ClInclude Include="..\common\StringFixer.h" />
     <ClInclude Include="..\common\svn_version_default\svn_version.h" />
     <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h" />
+    <ClInclude Include="..\common\thread.h" />
     <ClInclude Include="..\common\typedefs.h" />
     <ClInclude Include="..\common\version.h" />
     <ClInclude Include="..\common\versionNumber.h" />

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters	2013-11-12 21:17:57 UTC (rev 3199)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters	2013-11-12 21:25:39 UTC (rev 3200)
@@ -260,6 +260,9 @@
     <ClInclude Include="..\common\mptPathString.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\thread.h">
+      <Filter>Header Files\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\common\AudioCriticalSection.cpp">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.