From 1a373c87657db265bd8ab4ee3db15ed2f50b7c35 Mon Sep 17 00:00:00 2001 From: Debian Science Maintainers Date: Fri, 6 May 2011 14:52:41 +0100 Subject: [PATCH] fix-tcl8.6 Fix build failure with tcl 8.6 With this patch, opencascade still builds with tcl 8.5. Submitted upstream: http://www.opencascade.org/org/forum/thread_20125/ Gbp-Pq: Topic submitted Gbp-Pq: Name fix-tcl8.6.patch --- ros/src/Draw/Draw_Window.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ros/src/Draw/Draw_Window.cxx b/ros/src/Draw/Draw_Window.cxx index 1bc18cdfe..57cd85e0b 100644 --- a/ros/src/Draw/Draw_Window.cxx +++ b/ros/src/Draw/Draw_Window.cxx @@ -70,7 +70,7 @@ defaultPrompt: errChannel = Tcl_GetStdChannel(TCL_STDERR); if (code != TCL_OK) { if (errChannel) { - Tcl_Write(errChannel, Interp->result, -1); + Tcl_Write(errChannel, Tcl_GetStringResult(Interp), -1); Tcl_Write(errChannel, "\n", 1); } Tcl_AddErrorInfo(Interp, @@ -1044,7 +1044,7 @@ Standard_Boolean Init_Appli() mainWindow = Tk_MainWindow(interp) ; if (mainWindow == NULL) { - fprintf(stderr, "%s\n", interp->result); + fprintf(stderr, "%s\n", Tcl_GetStringResult(interp)); exit(1); } Tk_Name(mainWindow) = @@ -2064,7 +2064,7 @@ static DWORD WINAPI tkLoop(VOID) OCC_CATCH_SIGNALS Standard_Integer res = Tk_Init(interp) ; if (res != TCL_OK) - cout << "tkLoop: error in Tk initialization. Tcl reported: " << interp->result << endl; + cout << "tkLoop: error in Tk initialization. Tcl reported: " << Tcl_GetStringResult(interp) << endl; } catch (Standard_Failure) { cout <<"tkLoop: exception in TK_Init "<result); + fprintf(stderr, "%s\n", Tcl_GetStringResult(interp)); cout << "tkLoop: Tk_MainWindow() returned NULL. Exiting..." << endl; Tcl_Exit(0); } -- 2.30.2