diff -Nurd VTK5.10.1-orig/Common/vtkTclUtil.cxx VTK5.10.1/Common/vtkTclUtil.cxx
--- VTK5.10.1-orig/Common/vtkTclUtil.cxx	2012-10-15 22:33:21.000000000 +0200
+++ VTK5.10.1/Common/vtkTclUtil.cxx	2014-01-12 14:13:31.000000000 +0100
@@ -21,6 +21,12 @@
 #include <string>
 #include <vtksys/SystemTools.hxx>
 
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
+#define vtkTclGetErrorLine(m) (m->errorLine)
+#else
+#define vtkTclGetErrorLine(m) (Tcl_GetErrorLine(m))
+#endif
+
 extern "C"
 {
 #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
@@ -490,13 +496,15 @@
       vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
                              arg2->command << endl <<
                              Tcl_GetVar(arg2->interp,(char *)("errorInfo"),0) <<
-                             " at line number " << arg2->interp->errorLine);
+                             " at line number " <<
+                             vtkTclGetErrorLine(arg2->interp));
       }
     else
       {
       vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
                              arg2->command << endl <<
-                             " at line number " << arg2->interp->errorLine);
+                             " at line number " <<
+                             vtkTclGetErrorLine(arg2->interp));
       }
     }
 }
@@ -723,14 +731,15 @@
       vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
                              this->StringCommand << endl <<
                              Tcl_GetVar(this->Interp,(char *)("errorInfo"),0) <<
-                             " at line number " << this->Interp->errorLine);
+                             " at line number " <<
+                             vtkTclGetErrorLine(this->Interp));
       }
     else
       {
       vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
                              this->StringCommand << endl <<
-                             " at line number " << 
-                             this->Interp->errorLine);
+                             " at line number " <<
+                             vtkTclGetErrorLine(this->Interp));
       }
     }
   else if (res == -1)
diff -Nurd VTK5.10.1-orig/Utilities/vtktiff/tif_config.h.in VTK5.10.1/Utilities/vtktiff/tif_config.h.in
--- VTK5.10.1-orig/Utilities/vtktiff/tif_config.h.in	2012-10-15 22:33:21.000000000 +0200
+++ VTK5.10.1/Utilities/vtktiff/tif_config.h.in	2014-01-12 14:11:34.000000000 +0100
@@ -240,10 +240,10 @@
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#define inline
+//#ifndef __cplusplus
+//#define inline
 //#cmakedefine inline
-#endif
+//#endif
 
 /* Define to `long' if <sys/types.h> does not define. */
 #cmakedefine off_t