Fixed so modelica.h includes the c files, such that function inlining…

… can occur

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@744 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

c_runtime/memory_pool.c

@@ -80,7 +80,7 @@ void clear_current_state()
 /* allocates n reals in the real_buffer */
 real* real_alloc(int n)
 {
-  index_t start;
+  _index_t start;
 
   assert(n>=0);
   assert(current_state.real_buffer_ptr +n < NR_REAL_ELEMENTS);
@@ -95,7 +95,7 @@ real* real_alloc(int n)
 /* allocates n integers in the integer_buffer */
 integer* integer_alloc(int n)
 {
-  index_t start;
+  _index_t start;
 
   assert(n>=0);
   assert(current_state.integer_buffer_ptr +n < NR_INTEGER_ELEMENTS);
@@ -111,7 +111,7 @@ integer* integer_alloc(int n)
 /* allocates n strings in the string_buffer */
 string* string_alloc(int n)
 {
-  index_t start;
+  _index_t start;
 
   assert(n>=0);
   assert(current_state.string_buffer_ptr +n < NR_STRING_ELEMENTS);
@@ -127,7 +127,7 @@ string* string_alloc(int n)
 /* allocates n booleans in the boolean_buffer */
 boolean* boolean_alloc(int n)
 {
-  index_t start;
+  _index_t start;
 
   assert(n>=0);
   assert(current_state.boolean_buffer_ptr +n < NR_BOOLEAN_ELEMENTS);
@@ -142,7 +142,7 @@ boolean* boolean_alloc(int n)
 
 int* size_alloc(int n)
 {
-  index_t start;
+  _index_t start;
 
   assert(n>=0);
   assert(n + current_state.size_buffer_ptr < NR_SIZE_ELEMENTS);
@@ -156,7 +156,7 @@ int* size_alloc(int n)
 
 int** index_alloc(int n)
 {
-  index_t start;
+  _index_t start;
 
   assert(n>=0);
   assert(n + current_state.index_buffer_ptr < NR_SIZE_ELEMENTS);
@@ -168,7 +168,7 @@ int** index_alloc(int n)
   /*  return start;*/
 }
 
-index_t real_free(int n)
+_index_t real_free(int n)
 {
   assert(n>=0);
   assert(current_state.real_buffer_ptr-n>=0);
@@ -177,7 +177,7 @@ index_t real_free(int n)
   return current_state.real_buffer_ptr; 
 }
 
-index_t integer_free(int n)
+_index_t integer_free(int n)
 {
   assert(n>=0);
   assert(current_state.integer_buffer_ptr-n>=0);
@@ -186,7 +186,7 @@ index_t integer_free(int n)
   return current_state.integer_buffer_ptr; 
 }
 
-index_t string_free(int n)
+_index_t string_free(int n)
 {
   assert(n>=0);
   assert(current_state.string_buffer_ptr-n>=0);
@@ -195,7 +195,7 @@ index_t string_free(int n)
   return current_state.string_buffer_ptr; 
 }
 
-index_t boolean_free(int n)
+_index_t boolean_free(int n)
 {
   assert(n>=0);
   assert(current_state.boolean_buffer_ptr-n>=0);
@@ -204,7 +204,7 @@ index_t boolean_free(int n)
   return current_state.boolean_buffer_ptr; 
 }
 
-index_t size_free(int n)
+_index_t size_free(int n)
 {
   assert(n>=0);
   assert(current_state.size_buffer_ptr-n>=0);
@@ -213,7 +213,7 @@ index_t size_free(int n)
   return current_state.size_buffer_ptr; 
 }
 
-index_t index_free(int n)
+_index_t index_free(int n)
 {
   assert(n>=0);
   assert(current_state.index_buffer_ptr-n>=0);

c_runtime/memory_pool.h

@@ -34,8 +34,7 @@ typedef double real;
 typedef int integer;
 typedef const char* string;
 typedef int boolean;
-
-typedef int index_t;
+typedef int _index_t; 
 
 extern real real_buffer[NR_REAL_ELEMENTS];
 extern integer integer_buffer[NR_INTEGER_ELEMENTS];
@@ -45,12 +44,12 @@ extern integer size_buffer[NR_SIZE_ELEMENTS];
 extern int* index_buffer[NR_INDEX_ELEMENTS];
 
 struct state_s {
-  index_t real_buffer_ptr;
-  index_t integer_buffer_ptr;
-  index_t string_buffer_ptr;
-  index_t boolean_buffer_ptr;
-  index_t size_buffer_ptr;
-  index_t index_buffer_ptr;
+  _index_t real_buffer_ptr;
+  _index_t integer_buffer_ptr;
+  _index_t string_buffer_ptr;
+  _index_t boolean_buffer_ptr;
+  _index_t size_buffer_ptr;
+  _index_t index_buffer_ptr;
 };
 
 typedef struct state_s state;
@@ -74,10 +73,10 @@ boolean* boolean_alloc(int n);
 int* size_alloc(int n);
 int** index_alloc(int n);
 
-index_t real_free(int n);
-index_t integer_free(int n);
-index_t string_free(int n);
-index_t boolean_free(int n);
-index_t size_free(int n);
-index_t index_free(int n);
+_index_t real_free(int n);
+_index_t integer_free(int n);
+_index_t string_free(int n);
+_index_t boolean_free(int n);
+_index_t size_free(int n);
+_index_t index_free(int n);
 #endif

c_runtime/modelica.h

@@ -32,6 +32,16 @@
 #include "utility.h"
 #include "read_write.h"
 
+#include "memory_pool.c"
+#include "index_spec.c"
+
+#include "real_array.c"
+#include "integer_array.c"
+#include "string_array.c"
+#include "utility.c"
+#include "read_write.c"
+
+
 typedef real_array_t real_array;
 typedef integer_array_t integer_array;