- Move f2c.h includes to implementation files. Should not be part of …

…the default headers. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15753 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 6, 2013 · 11e27ea · 11e27ea
1 parent cf01109
commit 11e27ea
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -41,6 +41,7 @@
 #include "model_help.h"
 
 #include "dassl.h"
+#include "f2c.h"
 
 static const char *dasslMethodStr[DASSL_MAX] = {"unknown",
                                           "dassl",

diff --git a/SimulationRuntime/c/simulation/solver/linearSystem.c b/SimulationRuntime/c/simulation/solver/linearSystem.c
@@ -37,6 +37,8 @@
 #include "omc_error.h"
 #include "linearSystem.h"
 #include "linearSolverLapack.h"
+#include "blaswrap.h"
+#include "f2c.h"
 
 /*! \fn int allocatelinearSystem(DATA *data)
  *

diff --git a/SimulationRuntime/c/simulation/solver/linearSystem.h b/SimulationRuntime/c/simulation/solver/linearSystem.h
@@ -42,9 +42,6 @@
 extern "C" {
 #endif
 
-#include "blaswrap.h"
-#include "f2c.h"
-
 #ifdef VOID
 #undef VOID
 #endif

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverNewton.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverNewton.c
@@ -43,6 +43,7 @@
 
 #include "nonlinearSystem.h"
 #include "nonlinearSolverNewton.h"
+#include "f2c.h"
 
 typedef struct DATA_NEWTON
 {

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSystem.c b/SimulationRuntime/c/simulation/solver/nonlinearSystem.c
@@ -39,6 +39,10 @@
 #include "kinsolSolver.h"
 #include "nonlinearSolverHybrd.h"
 #include "nonlinearSolverNewton.h"
+#include "blaswrap.h"
+#include "f2c.h"
+
+extern doublereal enorm_(integer *n, doublereal *x);
 
 /*! \fn int allocateNonlinearSystem(DATA *data)
  *

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSystem.h b/SimulationRuntime/c/simulation/solver/nonlinearSystem.h
@@ -42,15 +42,10 @@
 extern "C" {
 #endif
 
-#include "blaswrap.h"
-#include "f2c.h"
-
 #ifdef VOID
 #undef VOID
 #endif
 
-extern doublereal enorm_(integer *n, doublereal *x);
-
 #ifdef __cplusplus
 }
 #endif