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

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

Revision: 3863
          http://sourceforge.net/p/modplug/code/3863
Author:   manxorist
Date:     2014-03-10 22:32:44 +0000 (Mon, 10 Mar 2014)
Log Message:
-----------
[Fix] VS2008 compile fixes.

Modified Paths:
--------------
    trunk/OpenMPT/common/misc_util.cpp
    trunk/OpenMPT/sounddev/SoundDeviceThread.cpp

Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp	2014-03-10 20:16:35 UTC (rev 3862)
+++ trunk/OpenMPT/common/misc_util.cpp	2014-03-10 22:32:44 UTC (rev 3863)
@@ -724,7 +724,6 @@
 
 Library::Library()
 //----------------
-	: m_Handle(nullptr)
 {
 	return;
 }
@@ -732,7 +731,6 @@
 
 Library::Library(const mpt::LibraryPath &path)
 //--------------------------------------------
-	: m_Handle(nullptr)
 {
 	m_Handle = MPT_SHARED_PTR<LibraryHandle>(new LibraryHandle(path));
 }

Modified: trunk/OpenMPT/sounddev/SoundDeviceThread.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceThread.cpp	2014-03-10 20:16:35 UTC (rev 3862)
+++ trunk/OpenMPT/sounddev/SoundDeviceThread.cpp	2014-03-10 22:32:44 UTC (rev 3863)
@@ -29,15 +29,15 @@
 	pCreateWaitableTimer = nullptr;
 	pSetWaitableTimer = nullptr;
 	pCancelWaitableTimer = nullptr;
-	m_Kernel32DLL = mpt::Library(mpt::LibraryPath::System(MPT_PATHSTRING("kernel32")));
 	#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
 		m_HasXP = true;
 		pCreateWaitableTimer = &CreateWaitableTimer;
 		pSetWaitableTimer = &SetWaitableTimer;
 		pCancelWaitableTimer = &CancelWaitableTimer;
 	#else
-		if(m_HasXP && m_hKernel32DLL)
+		if(m_HasXP)
 		{
+			m_Kernel32DLL = mpt::Library(mpt::LibraryPath::System(MPT_PATHSTRING("kernel32")));
 			if(!m_Kernel32DLL.Bind(pCreateWaitableTimer, "CreateWaitableTimerA"))
 			{
 				m_HasXP = false;

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