[Opalvoip-svn] SF.net SVN: opalvoip:[30406] ptlib/branches/v2_12/src/ptlib/msos

[<rjo...@us...>]

Revision: 30406
          http://sourceforge.net/p/opalvoip/code/30406
Author:   rjongbloed
Date:     2013-08-30 04:55:45 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
Fixed 64 bit compile.

Modified Paths:
--------------
    ptlib/branches/v2_12/src/ptlib/msos/directsound.cxx
    ptlib/branches/v2_12/src/ptlib/msos/sound_win32.cxx

Modified: ptlib/branches/v2_12/src/ptlib/msos/directsound.cxx
===================================================================
--- ptlib/branches/v2_12/src/ptlib/msos/directsound.cxx	2013-08-30 04:50:18 UTC (rev 30405)
+++ ptlib/branches/v2_12/src/ptlib/msos/directsound.cxx	2013-08-30 04:55:45 UTC (rev 30406)
@@ -1199,7 +1199,7 @@
     if (isDataAvailable) // Ok to read
       return true;
   }  // wait for DirectSound to notify us that space is available
-  while (WaitForMultipleObjects(2, m_triggerEvent, FALSE, std::max(m_bufferSectionSize,1000)) == WAIT_OBJECT_0);
+  while (WaitForMultipleObjects(2, m_triggerEvent, FALSE, std::max((int)m_bufferSectionSize,1000)) == WAIT_OBJECT_0);
 
   { // Aborted
     PWaitAndSignal mutex(m_bufferMutex);

Modified: ptlib/branches/v2_12/src/ptlib/msos/sound_win32.cxx
===================================================================
--- ptlib/branches/v2_12/src/ptlib/msos/sound_win32.cxx	2013-08-30 04:50:18 UTC (rev 30405)
+++ ptlib/branches/v2_12/src/ptlib/msos/sound_win32.cxx	2013-08-30 04:55:45 UTC (rev 30406)
@@ -1084,7 +1084,7 @@
 
 bool PSoundChannelWin32::WaitEvent(ErrorGroup group)
 {
-  switch (WaitForSingleObject(hEventDone, std::max(buffers[0].GetSize(),1000))) {
+  switch (WaitForSingleObject(hEventDone, std::max((int)buffers[0].GetSize(),1000))) {
     case WAIT_OBJECT_0 :
       return true;
 

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