- Renamed error.h to omc_error.h

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11446 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 16, 2012 · 72982a6 · 72982a6
1 parent 6f0de69
commit 72982a6
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 23 deletions.
diff --git a/Compiler/susan_codegen/SimCode/CodegenC.tpl b/Compiler/susan_codegen/SimCode/CodegenC.tpl
@@ -209,7 +209,7 @@ case SIMCODE(modelInfo=MODELINFO(__), extObjInfo=EXTOBJINFO(__)) then
   #include "openmodelica_func.h"
   #include "simulation_data.h"  
   #include "simulation_runtime.h"
-  #include "error.h"
+  #include "omc_error.h"
 
   #include <assert.h>
   #include <string.h>

diff --git a/Compiler/susan_codegen/SimCode/CodegenFMU.tpl b/Compiler/susan_codegen/SimCode/CodegenFMU.tpl
@@ -381,7 +381,7 @@ case SIMCODE(__) then
   #include "openmodelica.h"
   #include "openmodelica_func.h"
   #include "simulation_data.h"  
-  #include "error.h"
+  #include "omc_error.h"
   #include "fmiModelTypes.h"
   #include "fmiModelFunctions.h"
   #include "<%fileNamePrefix%>_functions.h"

diff --git a/SimulationRuntime/c/ModelicaExternalC/tables.c b/SimulationRuntime/c/ModelicaExternalC/tables.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "error.h"
+#include "omc_error.h"
 #include "tables.h"
 
 #include <stdio.h>

diff --git a/SimulationRuntime/c/linearization/linearize.cpp b/SimulationRuntime/c/linearization/linearize.cpp
@@ -28,7 +28,7 @@
  *
  */
 
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_data.h"
 #include "openmodelica_func.h"
 #include "linearize.h"

diff --git a/SimulationRuntime/c/math-support/delay.c b/SimulationRuntime/c/math-support/delay.c
@@ -32,7 +32,7 @@
  */
 
 #include "delay.h"
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_data.h"
 #include "ringbuffer.h"
 #include "openmodelica.h"

diff --git a/SimulationRuntime/c/math-support/initialization.c b/SimulationRuntime/c/math-support/initialization.c
@@ -33,7 +33,7 @@
 
 #include "initialization.h"
 #include "simulation_data.h"
-#include "error.h"
+#include "omc_error.h"
 #include "openmodelica.h"
 #include "openmodelica_func.h"
 #include "model_help.h"

diff --git a/SimulationRuntime/c/math-support/model_help.c b/SimulationRuntime/c/math-support/model_help.c
@@ -36,7 +36,7 @@
 #include "simulation_data.h"
 #include "model_help.h"
 #include "openmodelica_func.h"
-#include "error.h"
+#include "omc_error.h"
 #include "delay.h"
 #include "varinfo.h"
 

diff --git a/SimulationRuntime/c/simulation/results/simulation_result_csv.cpp b/SimulationRuntime/c/simulation/results/simulation_result_csv.cpp
@@ -38,7 +38,7 @@
  *
  */
 
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_result_csv.h"
 #include "rtclock.h"
 

diff --git a/SimulationRuntime/c/simulation/results/simulation_result_mat.cpp b/SimulationRuntime/c/simulation/results/simulation_result_mat.cpp
@@ -32,7 +32,7 @@
 
  */
 
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_result_mat.h"
 #include "rtclock.h"
 

diff --git a/SimulationRuntime/c/simulation/results/simulation_result_plt.cpp b/SimulationRuntime/c/simulation/results/simulation_result_plt.cpp
@@ -38,7 +38,7 @@
  *
  */
 
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_result_plt.h"
 #include "rtclock.h"
 

diff --git a/SimulationRuntime/c/simulation/simulation_input_xml.cpp b/SimulationRuntime/c/simulation/simulation_input_xml.cpp
@@ -43,7 +43,7 @@
 #include "simulation_input_xml.h"
 #include "simulation_runtime.h"
 #include "options.h"
-#include "error.h"
+#include "omc_error.h"
 
 #include <fstream>
 #include <iomanip>

diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -50,7 +50,7 @@
 #include <regex.h>
 #endif
 
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_data.h"
 #include "openmodelica_func.h"
 

diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -29,7 +29,7 @@
  */
 
 #include "dassl.h"
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_data.h"
 #include "simulation_runtime.h"
 #include "solver_main.h"

diff --git a/SimulationRuntime/c/simulation/solver/events.c b/SimulationRuntime/c/simulation/solver/events.c
@@ -29,7 +29,7 @@
  */
 
 #include "events.h"
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_data.h"
 #include "openmodelica.h"    /* for modelica types */
 #include "openmodelica_func.h"   /* for modelica fucntion */

diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -40,7 +40,7 @@
  * #include "dopri45.h"
  */
 #include "rtclock.h"
-#include "error.h"
+#include "omc_error.h"
 #include <math.h>
 #include <string.h>
 #include <errno.h>

diff --git a/SimulationRuntime/c/util/division.c b/SimulationRuntime/c/util/division.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include "division.h"
-#include "error.h"
+#include "omc_error.h"
 
 modelica_real division_error(modelica_real b, const char* division_str, const char* file, long line)
 {

diff --git a/SimulationRuntime/c/util/list.c b/SimulationRuntime/c/util/list.c
@@ -36,7 +36,7 @@
  */
 
 #include "list.h"
-#include "error.h"
+#include "omc_error.h"
 
 #include <memory.h>
 #include <stdlib.h>

diff --git a/SimulationRuntime/c/util/modelinfo.c b/SimulationRuntime/c/util/modelinfo.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_data.h"
 #include "rtclock.h"
 #include "modelinfo.h"

diff --git a/SimulationRuntime/c/util/error.c → SimulationRuntime/c/util/omc_error.c b/SimulationRuntime/c/util/error.c → SimulationRuntime/c/util/omc_error.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include "error.h"
+#include "omc_error.h"
 
 /* Global JumpBuffer */
 jmp_buf globalJmpbuf;

diff --git a/SimulationRuntime/c/util/error.h → SimulationRuntime/c/util/omc_error.h b/SimulationRuntime/c/util/error.h → SimulationRuntime/c/util/omc_error.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef ERROR_H
-#define ERROR_H
+#ifndef OMC_ERROR_H
+#define OMC_ERROR_H
 
 #include <setjmp.h>
 #include <stdio.h>

diff --git a/SimulationRuntime/c/util/ringbuffer.c b/SimulationRuntime/c/util/ringbuffer.c
@@ -34,7 +34,7 @@
  */
 
 #include "ringbuffer.h"
-#include "error.h"
+#include "omc_error.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/SimulationRuntime/c/util/varinfo.c b/SimulationRuntime/c/util/varinfo.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include "error.h"
+#include "omc_error.h"
 #include "simulation_data.h"
 #include "varinfo.h"