[patch] vtk-tcl8.5.patch

vtk-tcl8.5.patch (text/plain), 7.43 KB, created by Pacho Ramos on 2008-03-08 18:01:30 UTC

diff -ru VTK/Common/vtkTclUtil.cxx VTK.patch/Common/vtkTclUtil.cxx
--- VTK/Common/vtkTclUtil.cxx	2006-05-26 06:11:03.000000000 +0200
+++ VTK.patch/Common/vtkTclUtil.cxx	2007-06-10 21:38:07.000000000 +0200
@@ -23,11 +23,7 @@
 
 extern "C"
 {
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
   typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, CONST84 char *[]);
-#else
-  typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, char *[]);
-#endif
 }
 
 vtkTclInterpStruct *vtkGetInterpStruct(Tcl_Interp *interp)
diff -ru VTK/Rendering/vtkTkImageViewerWidget.cxx VTK.patch/Rendering/vtkTkImageViewerWidget.cxx
--- VTK/Rendering/vtkTkImageViewerWidget.cxx	2005-09-01 00:55:26.000000000 +0200
+++ VTK.patch/Rendering/vtkTkImageViewerWidget.cxx	2007-08-25 20:22:03.000000000 +0200
@@ -91,7 +91,7 @@
                          self->TkWin, 
                          vtkTkImageViewerWidgetConfigSpecs,
                          argc, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                          const_cast<CONST84 char **>(argv), 
 #else
                          argv, 
@@ -123,7 +123,7 @@
   int vtkTkImageViewerWidget_Widget(ClientData clientData, 
                                     Tcl_Interp *interp,
                                     int argc, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                     CONST84
 #endif
                                     char *argv[]) 
@@ -178,7 +178,7 @@
         result = vtkTkImageViewerWidget_Configure(interp, 
                                                   self, 
                                                   argc-2, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                                   const_cast<char **>(argv+2), 
 #else
                                                   argv+2, 
@@ -224,12 +224,12 @@
   int vtkTkImageViewerWidget_Cmd(ClientData clientData, 
                                  Tcl_Interp *interp, 
                                  int argc, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                  CONST84
 #endif
                                  char **argv)
   {
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
     CONST84
 #endif
     char *name;
@@ -281,7 +281,7 @@
     if (vtkTkImageViewerWidget_Configure(interp, 
                                          self, 
                                          argc-2, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                          const_cast<char **>(argv+2), 
 #else
                                          argv+2, 
diff -ru VTK/Rendering/vtkTkRenderWidget.cxx VTK.patch/Rendering/vtkTkRenderWidget.cxx
--- VTK/Rendering/vtkTkRenderWidget.cxx	2006-05-10 19:52:08.000000000 +0200
+++ VTK.patch/Rendering/vtkTkRenderWidget.cxx	2007-08-25 20:20:24.000000000 +0200
@@ -128,7 +128,7 @@
   int vtkImageDataToTkPhoto_Cmd (ClientData vtkNotUsed(clientData), 
                                  Tcl_Interp *interp, 
                                  int argc, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                  CONST84
 #endif
                                  char **argv)
@@ -361,7 +361,7 @@
                          self->TkWin, 
                          vtkTkRenderWidgetConfigSpecs,
                          argc, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                          const_cast<CONST84 char **>(argv), 
 #else
                          argv, 
@@ -393,7 +393,7 @@
   int vtkTkRenderWidget_Widget(ClientData clientData, 
                                Tcl_Interp *interp,
                                int argc, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                CONST84
 #endif
                                char *argv[]) 
@@ -444,7 +444,7 @@
         {
         /* Execute a configuration change */
         result = vtkTkRenderWidget_Configure(interp, self, argc-2, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                              const_cast<char **>(argv+2), 
 #else
                                              argv+2, 
@@ -490,12 +490,12 @@
   int vtkTkRenderWidget_Cmd(ClientData clientData, 
                             Tcl_Interp *interp, 
                             int argc, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                             CONST84
 #endif
                             char **argv)
   {
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
     CONST84
 #endif
     char *name;
@@ -545,7 +545,7 @@
     if (vtkTkRenderWidget_Configure(interp, 
                                     self, 
                                     argc-2, 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4 && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)
                                     const_cast<char **>(argv+2), 
 #else
                                     argv+2, 
diff -ru VTK/Wrapping/vtkWrapTclInit.c VTK.patch/Wrapping/vtkWrapTclInit.c
--- VTK/Wrapping/vtkWrapTclInit.c	2005-06-24 20:11:31.000000000 +0200
+++ VTK.patch/Wrapping/vtkWrapTclInit.c	2007-08-25 21:14:13.000000000 +0200
@@ -49,7 +49,7 @@
   fprintf(fout,
     "extern \"C\"\n"
     "{\n"
-    "#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) && (TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)\n"
+    "#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)// && (TCL_RELEASE_LEVEL >= TCL_FINAL_RELEASE)\n"
     "  typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, CONST84 char *[]);\n"
     "#else\n"
     "  typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, char *[]);\n"