Skip to content

Commit d8b1b16

Browse files
author
Peter Aronsson
committed
-Fixed compilation of rtclock.c for visual studio.
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@6084 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 5d114b6 commit d8b1b16

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Compiler/runtime/Makefile.vc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ IDL = $(OMDEV)\bin\mico\idl
2020
OBJ = rtopts.obj socketimpl.obj printimpl.obj systemimpl.obj systemimplmisc.obj dynload.obj settingsimpl.obj \
2121
ptolemyio.obj daeext.obj ErrorMessage.obj errorext.obj optmanager.obj \
2222
omc_communication.obj omc_communication_impl.obj corbaimpl.obj \
23-
unitparser.obj unitparserext.obj SimulationResults.obj IOStreamExt.obj
23+
unitparser.obj unitparserext.obj SimulationResults.obj IOStreamExt.obj rtclock.obj
2424

2525
all: $(OBJ) runtimevc.lib
2626

Compiler/runtime/rtclock.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ void rt_tick(int ix) {
4848

4949
double rt_tock(int ix) {
5050
LARGE_INTEGER tock_tp;
51+
double d1,d2;
5152
QueryPerformanceCounter(&tock_tp);
52-
double d1 = (double)(tock_tp.QuadPart - tick_tp[ix].QuadPart);
53-
double d2 = (double) performance_frequency.QuadPart;
53+
d1 = (double)(tock_tp.QuadPart - tick_tp[ix].QuadPart);
54+
d2 = (double) performance_frequency.QuadPart;
5455
return d1 / d2;
5556
}
5657

@@ -68,7 +69,7 @@ void rt_tick(int ix) {
6869
double rt_tock(int ix) {
6970
uint64_t tock_tp = mach_absolute_time();
7071
uint64_t nsec;
71-
static mach_timebase_info_data_t info = {0,0};
72+
static mach_timebase_info_data_t info = {0,0};
7273
if (info.denom == 0)
7374
mach_timebase_info(&info);
7475
uint64_t elapsednano = (tock_tp-tick_tp[ix]) * (info.numer / info.denom);

0 commit comments

Comments
 (0)