Win32 compilation fixes

diff --git a/source/core/semaphore.cpp b/source/core/semaphore.cpp
index 06777fb984872f9444dc4c3146208c3e50643ae3..7006eafc51ae5e8c43d938c9f8d04824fbc5e03c 100644 (file)
--- a/source/core/semaphore.cpp
+++ b/source/core/semaphore.cpp
@@ -7,6 +7,7 @@ Distributed under the LGPL
 #include <errno.h>
 #include "semaphore.h"
 #include "../time/timestamp.h"
+#include "../time/units.h"
 #include "../time/utils.h"
 
 namespace Msp {

diff --git a/source/core/semaphore.h b/source/core/semaphore.h
index 164131acaaa8c19d5f94b9139be12fe9e05117a6..a7cdff7371d4f301468ff42da669cea6daa5db26 100644 (file)
--- a/source/core/semaphore.h
+++ b/source/core/semaphore.h
@@ -32,7 +32,9 @@ public:
        ~Semaphore()       { CloseHandle(sem); }
 #endif
 private:
+#ifndef WIN32
        Mutex mutex;
+#endif
        SemaphoreHandle sem;
 };
 

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 641d55f03b03a71d4b2a3a41cf04a7824aa56898..3d4aec5ff4a8f6307ceaea732484e8c779b89f10 100644 (file)
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -3,7 +3,6 @@ This file is part of libmspframework
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#include <signal.h>
 #include "timer.h"
 #include "utils.h"
 
@@ -91,7 +90,7 @@ void Timer::Thread::main()
                        }
                }
                else
-                       pause();
+                       sem.wait();
        }
 }