From d13a232e4b701275b9964401adf1eeecd61fcd96 Mon Sep 17 00:00:00 2001 From: cascade Date: Fri, 13 Feb 2009 18:33:58 +0000 Subject: [PATCH] OCC20850 umake command do not work on SunOS10 --- src/WOKSH/wokprocess.cxx | 7 +++---- src/WOKSH/woksh.cxx | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/WOKSH/wokprocess.cxx b/src/WOKSH/wokprocess.cxx index 5500bc5..a85d9db 100755 --- a/src/WOKSH/wokprocess.cxx +++ b/src/WOKSH/wokprocess.cxx @@ -39,9 +39,6 @@ #include -//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 62f2927..53d0097 100755 --- a/src/WOKSH/woksh.cxx +++ b/src/WOKSH/woksh.cxx @@ -56,9 +56,6 @@ int main(int argc, char **argv) #include -//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; } -- 2.39.5