Skip to content

Commit 4f21054

Browse files
author
Jens Frenkel
committed
- rename SimulationRuntime/c/inline to omc_inline to avoid confilct with Inline.h from Compiler/Inline.mo
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12601 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 3ef441a commit 4f21054

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

SimulationRuntime/c/Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ FFLAGS = -O -fexceptions
1515
# P.A: before, g77 had -O3 or -O2 but that caused a bug in DDASRT, giving infinite loop.
1616

1717
RUNTIME_HEADERS = ./f2c.h \
18-
./inline.h \
18+
./omc_inline.h \
1919
./math-support/blaswrap.h \
2020
./math-support/matrix.h \
2121
./meta/gc/common.h \

SimulationRuntime/c/ModelicaExternalC/tables.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <ctype.h>
3838
#include <math.h>
3939

40-
#include "inline.h"
40+
#include "omc_inline.h"
4141
#ifdef _MSC_VER
4242
#include "omc_msvc.h"
4343
#endif
File renamed without changes.

SimulationRuntime/c/openmodelica.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ typedef void* modelica_fnptr;
8888
#define EXIT(code) {fflush(NULL); _exit(code);}
8989
#endif
9090

91-
#include "inline.h"
91+
#include "omc_inline.h"
9292

9393

9494
/* BEFORE: modelica_string.h */

SimulationRuntime/c/util/modelica.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ extern "C" {
7777
#define EXIT(code) {fflush(NULL); _exit(code);}
7878
#endif
7979

80-
#include "inline.h"
80+
#include "omc_inline.h"
8181

8282
#include "modelica_string.h"
8383
#include "memory_pool.h"

0 commit comments

Comments
 (0)