From c6a8a6264a80326bcd0ea33d107bbedb300ad250 Mon Sep 17 00:00:00 2001
From: Adrian Pop <adrian.pop@liu.se>
Date: Sat, 24 Sep 2011 02:25:01 +0000
Subject: [PATCH] - SimCode.mo   do not use listReverse on libs as List.union
 does not reverse the list anymore.   this is needed to fix the wrong library
 order for linking. - update to version 1.8.0

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9917 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
---
 Compiler/BackEnd/SimCode.mo | 6 +++---
 Compiler/runtime/config.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Compiler/BackEnd/SimCode.mo b/Compiler/BackEnd/SimCode.mo
index 15777569b61..66f69696dda 100644
--- a/Compiler/BackEnd/SimCode.mo
+++ b/Compiler/BackEnd/SimCode.mo
@@ -1699,7 +1699,7 @@ algorithm
       list<RecordDeclaration> decls;
       String name;
     case ({}, accfns, rt, decls, includes, includeDirs, libs)
-    then (listReverse(accfns), rt, decls, listReverse(includes), includeDirs, listReverse(libs));
+    then (listReverse(accfns), rt, decls, includes, includeDirs, libs);
     case ((DAE.FUNCTION(type_ = (DAE.T_FUNCTION(functionAttributes=DAE.FUNCTION_ATTRIBUTES(isBuiltin=DAE.FUNCTION_BUILTIN_PTR())),_)) :: rest), accfns, rt, decls, includes, includeDirs, libs)
       equation
         // skip over builtin functions
@@ -1808,7 +1808,7 @@ algorithm
         inVars = List.map(DAEUtil.getInputVars(daeElts), daeInOutSimVar);
         biVars = List.map(DAEUtil.getBidirVars(daeElts), daeInOutSimVar);
         (recordDecls,rt_1) = elaborateRecordDeclarations(daeElts, recordDecls, rt);
-        (fn_includes, fn_includeDirs, fn_libs,dynamicLoad) = generateExtFunctionIncludes(fpath,ann);
+        (fn_includes, fn_includeDirs, fn_libs, dynamicLoad) = generateExtFunctionIncludes(fpath,ann);
         includes = List.union(fn_includes, includes);
         includeDirs = List.union(fn_includeDirs, includeDirs);
         libs = List.union(fn_libs, libs);
@@ -1821,7 +1821,7 @@ algorithm
       then
         (EXTERNAL_FUNCTION(fpath, extfnname, funArgs, simextargs, extReturn,
           inVars, outVars, biVars, fn_libs, lang, info, dynamicLoad),
-          rt_1,recordDecls,includes,includeDirs,libs);
+          rt_1, recordDecls, includes, includeDirs, libs);
         
         // Record constructor.
     case (DAE.RECORD_CONSTRUCTOR(path = fpath, source = source, type_ = tp as (DAE.T_FUNCTION(funcArg = args,funcResultType = restype as (DAE.T_COMPLEX(complexClassType = ClassInf.RECORD(name)),_)),_)), rt,recordDecls,includes,includeDirs,libs)
diff --git a/Compiler/runtime/config.h b/Compiler/runtime/config.h
index 9ce343b323f..fcd533e2ff1 100644
--- a/Compiler/runtime/config.h
+++ b/Compiler/runtime/config.h
@@ -90,9 +90,9 @@
 #endif
 
 #ifdef CONFIG_REVISION
-#define CONFIG_VERSION "1.7.0 (r" CONFIG_REVISION ")"
+#define CONFIG_VERSION "1.8.0 (r" CONFIG_REVISION ")"
 #else
-#define CONFIG_VERSION "1.7.0"
+#define CONFIG_VERSION "1.8.0"
 #endif