From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 5 Sep 2006 13:32:12 +0000 (+0000)
Subject: Win32 compilation fixes
X-Git-Tag: 1.0~37
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=ff52b5032a3f040de5d3a48f953f2943d7a223b3;p=libs%2Fcore.git

Win32 compilation fixes
---

diff --git a/source/core/semaphore.cpp b/source/core/semaphore.cpp
index 06777fb..7006eaf 100644
--- 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 164131a..a7cdff7 100644
--- 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 641d55f..3d4aec5 100644
--- 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();
 	}
 }