Fix linking

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

Author: sjoelund

Compiler/runtime/corbaimpl.cpp

@@ -310,18 +310,18 @@ Please stop or kill the other OMC process first!\nOpenModelica OMC will now exit
 
 using namespace std;
 
-static pthread_mutex_t omc_corba_lock;
-static pthread_mutex_t omc_corba_clientlock;
+pthread_mutex_t omc_corba_lock;
+pthread_mutex_t omc_corba_clientlock;
 
 // Condition variable for keeping omc waiting for client requests
-static pthread_cond_t omc_waitformsg;
-static pthread_mutex_t omc_waitlock;
-static bool omc_waiting=false;
+pthread_cond_t omc_waitformsg;
+pthread_mutex_t omc_waitlock;
+bool omc_waiting=false;
 
 // Condition variable for keeping corba waiting for returnvalue from omc
-static pthread_cond_t corba_waitformsg;
-static pthread_mutex_t corba_waitlock;
-static bool corba_waiting=false;
+pthread_cond_t corba_waitformsg;
+pthread_mutex_t corba_waitlock;
+bool corba_waiting=false;
 
 void* runOrb(void* arg)
 {

Compiler/runtime/omc_communication_impl.cpp

@@ -93,7 +93,7 @@ extern "C" {
   #include <pthread.h>
 }
 
-extern pthread_mutex_t clientlock;
+extern pthread_mutex_t omc_corba_clientlock;
 
 extern pthread_cond_t omc_waitformsg;
 extern pthread_mutex_t omc_waitlock;
@@ -116,7 +116,7 @@ OmcCommunication_impl::OmcCommunication_impl()
 
 char* OmcCommunication_impl::sendExpression( const char* expr )
 {
-  pthread_mutex_lock(&clientlock);
+  pthread_mutex_lock(&omc_corba_clientlock);
   char* result;
   // Signal to omc that message has arrived.
   pthread_mutex_lock(&omc_waitlock);
@@ -133,7 +133,7 @@ char* OmcCommunication_impl::sendExpression( const char* expr )
   corba_waiting = false;
   result = CORBA::string_dup(omc_reply_message);
   pthread_mutex_unlock(&corba_waitlock);
-  pthread_mutex_unlock(&clientlock);
+  pthread_mutex_unlock(&omc_corba_clientlock);
   return result; // Has already been string_dup (prepared for CORBA)
 }