Skip to content

Commit a8438dc

Browse files
committed
- fix Windows build: include omc_msvc.h and use OMC_INLINE instead of inline
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19967 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 54c7e9d commit a8438dc

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

SimulationRuntime/c/util/rtclock.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
#if defined(__MINGW32__) || defined(_MSC_VER)
3939
#include <windows.h>
40+
#include "omc_msvc.h"
4041
#if defined(_MSC_VER)
4142
#include <intrin.h>
4243
#endif
@@ -379,7 +380,7 @@ int rtclock_compare(rtclock_t t1, rtclock_t t2) {
379380

380381
#endif
381382

382-
static inline void alloc_and_copy(void **ptr, size_t n, size_t sz)
383+
static OMC_INLINE void alloc_and_copy(void **ptr, size_t n, size_t sz)
383384
{
384385
void *newmemory = GC_malloc(n*sz);
385386
assert(newmemory != 0);

0 commit comments

Comments
 (0)