OCC20850 umake command do not work on SunOS10

diff --git a/src/WOKSH/wokprocess.cxx b/src/WOKSH/wokprocess.cxx
index 5500bc5d26f9dae5df0ff3f256a0d75e3d806292..a85d9dbcca112ee3d5245397fcd04a4c33ee4e50 100755 (executable)
--- a/src/WOKSH/wokprocess.cxx
+++ b/src/WOKSH/wokprocess.cxx
@@ -39,9 +39,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* );
@@ -66,6 +63,8 @@ int main(int argc, char **argv)
   _debug_break ( "main" );
 #endif  // WNT && _DEBUG
 
+  Handle(WOKTclTools_Interpretor)& CurrentInterp = WOKTclTools_Interpretor::Current();
+
   WOKTclTools_PInterp interp  = Tcl_CreateInterp();
   
   if(WOKTclTools_Interpretor::Current().IsNull())
@@ -123,7 +122,7 @@ int main(int argc, char **argv)
     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/WOKSH/woksh.cxx b/src/WOKSH/woksh.cxx
index 62f2927c2dd5feff6b011ddec78e8aa4609afad5..53d00978626d6e7680281fbdceff0f5e01ab7869 100755 (executable)
--- a/src/WOKSH/woksh.cxx
+++ b/src/WOKSH/woksh.cxx
@@ -56,9 +56,6 @@ int main(int argc, char **argv)
 
 #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* );
@@ -82,6 +79,8 @@ int Wok_Init(WOKTclTools_PInterp interp)
   _debug_break ( "Wok_Init" );
 #endif  // WNT && _DEBUG
   
+  Handle(WOKTclTools_Interpretor)& CurrentInterp = WOKTclTools_Interpretor::Current();
+
   if(WOKTclTools_Interpretor::Current().IsNull())
     {
       CurrentInterp = new WOKTCL_Interpretor;
@@ -177,7 +176,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;
   }