Skip to content

Commit e256fc8

Browse files
committed
Adrian Pop,
- small changes to make runtime and winruntime more uniform. We should really unify them and put compiler #ifdef. I'll get to that in some near future. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2178 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 79afa70 commit e256fc8

File tree

5 files changed

+4
-15
lines changed

5 files changed

+4
-15
lines changed

Compiler/runtime/corbaimpl_stub.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11

2-
#ifdef __MINGW32__
3-
4-
#include "../winruntime/corbaimpl_stub.cpp"
5-
6-
#else
72

83
extern "C" {
94
#include "rml.h"
10-
#include "../values.h"
11-
#include <stdio.h>
12-
#include "../absyn_builder/yacclib.h"
13-
#include <pthread.h>
145
}
156

167
#include <cstdlib>
@@ -60,5 +51,3 @@ RML_BEGIN_LABEL(Corba__close)
6051
}
6152
RML_END_LABEL
6253
}
63-
64-
#endif /* MINGW32 */

Compiler/winruntime/corbaimpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4545

4646
extern "C" {
4747
#include "rml.h"
48-
#include "../values.h"
48+
#include "../Values.h"
4949
#include <stdio.h>
5050
#include "../absyn_builder/yacclib.h"
5151
//#include <pthread.h>

Compiler/winruntime/ptolemyio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ using namespace std;
5353
extern "C"
5454
{
5555
#include "rml.h"
56-
#include "../values.h"
56+
#include "../Values.h"
5757
#include <stdio.h>
5858
#include "../absyn_builder/yacclib.h"
5959
void print_error_buf_impl(char*str);

Compiler/winruntime/settingsimpl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
/* THIS FILE DOES NOT CONTAIN ANY CODE. ALL CODE IS IN */
3-
/* ../runtim/settingsimpl.c */
3+
/* ../runtime/settingsimpl.c */
44
#include "../runtime/settingsimpl.c"

Compiler/winruntime/systemimpl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4747
#include <string.h>
4848
#include <sys/stat.h>
4949
#include <time.h>
50-
#include "../values.h"
50+
#include "../Values.h"
5151
#include "../absyn_builder/yacclib.h"
5252
#define WIN32_LEAN_AND_MEAN
5353
#include <windows.h>

0 commit comments

Comments
 (0)