- attempt to fix windows build

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20841 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 26, 2014 · 768e0be · 768e0be
1 parent fc625e4
commit 768e0be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -28,9 +28,7 @@
  *
  */
 
-#ifdef _MSC_VER
-  #include <windows.h>
-#endif
+#include "omc_msvc.h"
 
 #include <setjmp.h>
 #include <string>

diff --git a/SimulationRuntime/c/util/omc_msvc.c b/SimulationRuntime/c/util/omc_msvc.c
@@ -34,6 +34,9 @@
 #include <stdlib.h>
 
 #if defined(__MINGW32__) || defined(_MSC_VER)
+#include <windows.h>
+#include <time.h>
+
 int asprintf(char **strp, const char *fmt, ...) {
   int len;
   va_list ap;
@@ -85,7 +88,7 @@ unsigned int alarm (unsigned int seconds)
 
   pending = seconds;
 
-  if (nsec) {
+  if (seconds) {
       time (&t0);   // keep track of when count down started
       DWORD threadId;
       thread = CreateThread (0, 0, killProcess, (void*)seconds, 0, &threadId);

diff --git a/SimulationRuntime/c/util/omc_msvc.h b/SimulationRuntime/c/util/omc_msvc.h
@@ -78,6 +78,10 @@ unsigned int alarm (unsigned int seconds);
 
 #else /* not msvc */
 
+#if defined(__MINGW32__)
+unsigned int alarm (unsigned int seconds);
+#endif
+
 /* define inline for non-MSVC */
 #define OMC_INLINE inline