- Fix wrong prototype used in some libraries

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

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/SimulationRuntime/c/meta/meta_modelica_segv.c b/SimulationRuntime/c/meta/meta_modelica_segv.c
@@ -42,6 +42,7 @@
 #include <assert.h>
 #include <pthread.h>
 #include <setjmp.h>
+#include <unistd.h>
 
 /* Really 64kB memory for this? Oh well... */
 #define TRACE_NFRAMES 65536
@@ -113,13 +114,10 @@ static void getStackBase() {
    */
   pthread_t self = pthread_self();
 #if !defined(__APPLE_CC__)
-  struct rlimit rl;
   size_t size = 0;
   pthread_attr_t sattr;
   pthread_attr_init(&sattr);
   pthread_getattr_np(self, &sattr);
-  /* assert(0==getrlimit(RLIMIT_STACK,&rl));
-  stackSize = rl.rlim_cur; */
   assert(0==pthread_attr_getstack(&sattr, &stackBottom, &size));
   assert(stackBottom);
   pthread_attr_destroy(&sattr);

diff --git a/SimulationRuntime/c/simulation/solver/linearSolverLapack.c b/SimulationRuntime/c/simulation/solver/linearSolverLapack.c
@@ -43,6 +43,10 @@
 
 #include "linearSystem.h"
 #include "linearSolverLapack.h"
+#include "blaswrap.h"
+#include "f2c.h"
+extern int dgesv_(integer *n, integer *nrhs, doublereal *a, integer *lda,
+                  integer *ipiv, doublereal *b, integer *ldb, integer *info);
 
 typedef struct DATA_LAPACK
 {

diff --git a/SimulationRuntime/c/simulation/solver/linearSolverLapack.h b/SimulationRuntime/c/simulation/solver/linearSolverLapack.h
@@ -41,23 +41,17 @@
   extern "C" {
 #endif
 
-#include "blaswrap.h"
-#include "f2c.h"
-
 #ifdef VOID
   #undef VOID
 #endif
 
-extern int dgesv_(integer *n, integer *nrhs, doublereal *a, integer *lda,
-                  integer *ipiv, doublereal *b, integer *ldb, integer *info);
-
 #ifdef __cplusplus
   }
 #endif
 
 int allocateLapackData(int size, void **data);
 int freeLapackData(void **data);
-int solvePack(DATA *data, int sysNumber);
+int solveLapack(DATA *data, int sysNumber);
 
 #endif
 
diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c
@@ -43,6 +43,7 @@
 
 #include "nonlinearSystem.h"
 #include "nonlinearSolverHybrd.h"
+extern doublereal enorm_(integer *n, doublereal *x);
 
 typedef struct DATA_HYBRD
 {

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverNewton.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverNewton.c
@@ -44,6 +44,7 @@
 #include "nonlinearSystem.h"
 #include "nonlinearSolverNewton.h"
 #include "f2c.h"
+extern doublereal enorm_(integer *n, doublereal *x);
 
 typedef struct DATA_NEWTON
 {