- Renamed the interface file to avoid conflicts.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19880 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 31, 2014 · cfb70f6 · cfb70f6
1 parent 9795b80
commit cfb70f6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Compiler/Template/CodegenFMU.tpl b/Compiler/Template/CodegenFMU.tpl
@@ -427,7 +427,7 @@ case SIMCODE(__) then
   #include "fmiModelFunctions.h"
   #include "simulation/solver/initialization/initialization.h"
   #include "simulation/solver/events.h"
-  #include "fmu_model_interface.h"
+  #include "fmu1_model_interface.h"
 
   #ifdef __cplusplus
   extern "C" {
@@ -448,8 +448,8 @@ case SIMCODE(__) then
   <%ModelDefineData(modelInfo)%>
 
   // implementation of the Model Exchange functions
-  #define fmu_model_interface_setupDataStruc <%symbolName(modelNamePrefix(simCode),"setupDataStruc")%>
-  #include "fmu_model_interface.c"
+  #define fmu1_model_interface_setupDataStruc <%symbolName(modelNamePrefix(simCode),"setupDataStruc")%>
+  #include "fmu1_model_interface.c"
 
   <%setDefaultStartValues(modelInfo)%>
   <%setStartValues(modelInfo)%>

diff --git a/SimulationRuntime/c/CMakeLists.txt b/SimulationRuntime/c/CMakeLists.txt
@@ -380,7 +380,7 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
   # target fuer OM_OUTPUT
   ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
 
-  SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu_model_interface.h
+  SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.h
                    ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
 				   ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
 
@@ -465,7 +465,7 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
   # target fuer OM_OUTPUT
   ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
 
-  SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu_model_interface.h
+  SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.h
                    ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
 				   ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
 

diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -204,7 +204,7 @@ install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) simulation/libf2c/libf2
 	cp -p $(RUNTIMEUTIL_HEADERS) $(builddir_inc)/c/util/
 	# copy fmi stuff
 	cp -p $(RUNTIME_HEADERS_FMU) ../fmi/export/fmi1/*.h \
-	   ../fmi/export/fmi1/fmu_model_interface.c $(builddir_inc)/c
+	   ../fmi/export/fmi1/fmu1_model_interface.c $(builddir_inc)/c
 	# copy java interface stuff
 	@$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) && \
 	$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) install || \

diff --git a/...ime/fmi/export/fmi1/fmu_model_interface.c → ...me/fmi/export/fmi1/fmu1_model_interface.c b/...ime/fmi/export/fmi1/fmu_model_interface.c → ...me/fmi/export/fmi1/fmu1_model_interface.c
@@ -136,7 +136,7 @@ fmiComponent fmiInstantiateModel(fmiString instanceName, fmiString GUID,
   if (comp->loggingOn) comp->functions.logger(NULL, instanceName, fmiOK, "log",
       "fmiInstantiateModel: GUID=%s", GUID);
   /* intialize modelData */
-  fmu_model_interface_setupDataStruc(comp->fmuData);
+  fmu1_model_interface_setupDataStruc(comp->fmuData);
   initializeDataStruc(comp->fmuData);
 
   /* setup model data with default start data */

diff --git a/...ime/fmi/export/fmi1/fmu_model_interface.h → ...me/fmi/export/fmi1/fmu1_model_interface.h b/...ime/fmi/export/fmi1/fmu_model_interface.h → ...me/fmi/export/fmi1/fmu1_model_interface.h