OCC20850 umake command do not work on SunOS10

diff --git a/src/WOKLibs/mscmd.cxx b/src/WOKLibs/mscmd.cxx
index 526ab16deb9e7fa1a79ed8620c48f6523b04fcfa..ec0b7bbd1ac4b95c3f6cd657fdc152842c3ffdd9 100755 (executable)
--- a/src/WOKLibs/mscmd.cxx
+++ b/src/WOKLibs/mscmd.cxx
@@ -21,9 +21,6 @@
 #include <MSAPI_ExternMet.hxx>
 #include <MSAPI_MemberMet.hxx>
 
-//extern Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-
 #ifdef WNT
 # ifdef _DEBUG
 extern "C" void _debug_break ( char* );
@@ -40,6 +37,8 @@ int Ms_Init(WOKTclTools_PInterp interp)
   
   OSD::SetSignal();                  //==== Armed the signals. =============
  
+  Handle(WOKTclTools_Interpretor)& CurrentInterp = WOKTclTools_Interpretor::Current();
+
   if(WOKTclTools_Interpretor::Current().IsNull())
     {
       CurrentInterp = new WOKTclTools_Interpretor;

diff --git a/src/WOKLibs/wokcmd.cxx b/src/WOKLibs/wokcmd.cxx
index af96ba9cea25470f3a0cc74b50e23bbfcfdaf4a0..e43c53759d31666b36b2a479dad80e5d59359681 100755 (executable)
--- a/src/WOKLibs/wokcmd.cxx
+++ b/src/WOKLibs/wokcmd.cxx
@@ -32,9 +32,6 @@
 
 #include <WOKTCL_TriggerHandler.hxx>
 
-//extern Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-
 #ifdef WNT
 # ifdef _DEBUG
 extern "C" void _debug_break ( char* );
@@ -60,6 +57,8 @@ int Wok_Init(WOKTclTools_PInterp interp)
 
   OSD::SetSignal();                  //==== Armed the signals. =============
 
+  Handle(WOKTclTools_Interpretor)& CurrentInterp = WOKTclTools_Interpretor::Current();
+
   if(WOKTclTools_Interpretor::Current().IsNull())
     {
       CurrentInterp = new WOKTCL_Interpretor;
@@ -156,7 +155,7 @@ int Wok_Init(WOKTclTools_PInterp interp)
     Handle(Standard_Failure) E = Standard_Failure::Caught();
     Standard_SStream astream;
     astream << E << ends;
-    ErrorMsg << "WOKTCL_AppInit" << "Exception was raised : " << GetSString(astream) << endm;
+    ErrorMsg() << "WOKTCL_AppInit" << "Exception was raised : " << GetSString(astream) << endm;
     WOKUtils_ProcessManager::UnArm();
     return TCL_ERROR;
   }

diff --git a/src/WOKLibs/woktoolscmd.cxx b/src/WOKLibs/woktoolscmd.cxx
index 469d9eded26134ec1b33b12c630549b8301c8e2e..f30fdd6502c3cd62feaea0a7a5e4c5a3a6710386 100755 (executable)
--- a/src/WOKLibs/woktoolscmd.cxx
+++ b/src/WOKLibs/woktoolscmd.cxx
@@ -12,9 +12,6 @@
 #include <WOKTclTools_MsgAPI.hxx>
 #include <WOKTclTools_Package.hxx>
 
-//extern Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-
 #ifdef WNT
 # ifdef _DEBUG
 extern "C" void _debug_break ( char* );
@@ -30,6 +27,8 @@ int Woktools_Init(WOKTclTools_PInterp interp)
 {
   OSD::SetSignal();                  //==== Armed the signals. =============
 
+  Handle(WOKTclTools_Interpretor)& CurrentInterp = WOKTclTools_Interpretor::Current();
+
   if(WOKTclTools_Interpretor::Current().IsNull())
     {
       CurrentInterp = new WOKTclTools_Interpretor(interp);

diff --git a/src/WOKLibs/wokutilscmd.cxx b/src/WOKLibs/wokutilscmd.cxx
index e377810b38f5d5ca08b699b804413966cc7354da..65c5934a5538099462b0dfc29ecdaf0b1f6069f4 100755 (executable)
--- a/src/WOKLibs/wokutilscmd.cxx
+++ b/src/WOKLibs/wokutilscmd.cxx
@@ -10,9 +10,6 @@
 #include <WOKTclUtils_Path.hxx>
 #include <WOKTclTools_Package.hxx>
 
-//extern Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-
 #ifdef WNT
 # ifdef _DEBUG
 extern "C" void _debug_break ( char* );
@@ -26,6 +23,8 @@ extern "C" int WOKUTILS_EXPORT Wokutils_Init(WOKTclTools_PInterp);
 
 int Wokutils_Init(WOKTclTools_PInterp interp)
 {
+  Handle(WOKTclTools_Interpretor)& CurrentInterp = WOKTclTools_Interpretor::Current();
+
   if(WOKTclTools_Interpretor::Current().IsNull())
     {
       CurrentInterp = new WOKTclTools_Interpretor(interp);