[Sumover-dev] [svn commit] r4591 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Thu Feb  4 12:59:23 2010
New Revision: 4591

Modified:
   vic/branches/mpeg4/Tcl.cpp
   vic/branches/mpeg4/main.cpp

Log:
Some changes to work with Tcl/Tk 8.0 again


Modified: vic/branches/mpeg4/Tcl.cpp
==============================================================================
--- vic/branches/mpeg4/Tcl.cpp	(original)
+++ vic/branches/mpeg4/Tcl.cpp	Thu Feb  4 12:59:23 2010
@@ -107,7 +107,11 @@
 	if (st != TCL_OK) {
 		int n = strlen(application_) + strlen(s);
 		char* wrk = new char[n + 80];
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 5)
+		sprintf(wrk, "tkerror \"%s: %s\"", application_, s);
+#else
 		sprintf(wrk, "bgerror \"%s: %s\"", application_, s);
+#endif
 		Tcl_GlobalEval(tcl_, wrk);
 		delete[] wrk; //SV-XXX: Debian
 		//exit(1);

Modified: vic/branches/mpeg4/main.cpp
==============================================================================
--- vic/branches/mpeg4/main.cpp	(original)
+++ vic/branches/mpeg4/main.cpp	Thu Feb  4 12:59:23 2010
@@ -516,8 +516,9 @@
 		else if (op == '?')
 			usage(NULL);
 	}
-
+#ifdef USE_ZVFS
 	Tcl_FindExecutable(argv[0]);
+#endif
 	Tcl::init("vic");
 	Tcl& tcl = Tcl::instance();