Skip to content

Commit

Permalink
- fix Windows build: include omc_msvc.h and use OMC_INLINE instead of…
Browse files Browse the repository at this point in the history
… inline

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19967 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Apr 3, 2014
1 parent 54c7e9d commit a8438dc
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion SimulationRuntime/c/util/rtclock.c
Expand Up @@ -37,6 +37,7 @@

#if defined(__MINGW32__) || defined(_MSC_VER)
#include <windows.h>
#include "omc_msvc.h"
#if defined(_MSC_VER)
#include <intrin.h>
#endif
Expand Down Expand Up @@ -379,7 +380,7 @@ int rtclock_compare(rtclock_t t1, rtclock_t t2) {

#endif

static inline void alloc_and_copy(void **ptr, size_t n, size_t sz)
static OMC_INLINE void alloc_and_copy(void **ptr, size_t n, size_t sz)
{
void *newmemory = GC_malloc(n*sz);
assert(newmemory != 0);
Expand Down

0 comments on commit a8438dc

Please sign in to comment.