Gentoo Attachment #145580 for bug #212700

View | Details | Raw Unified
Collapse All | Expand All

(-) VTK/Common/vtkTclUtil.cxx (-4 lines)

Lines 23-33	Link Here

extern "C"

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 *[]);

  typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, CONST84 char *[]);

#else

  typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, char *[]);

#endif

vtkTclInterpStruct *vtkGetInterpStruct(Tcl_Interp *interp)

vtkTclInterpStruct *vtkGetInterpStruct(Tcl_Interp *interp)

(-) VTK/Rendering/vtkTkImageViewerWidget.cxx (-6 / +6 lines)

Lines 91-97	Link Here

                         self->TkWin,

                         self->TkWin,

                         vtkTkImageViewerWidgetConfigSpecs,

                         vtkTkImageViewerWidgetConfigSpecs,

                         argc,

                         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),

                         const_cast<CONST84 char **>(argv),

#else

#else

                         argv,

                         argv,

Lines 123-129	Link Here

  int vtkTkImageViewerWidget_Widget(ClientData clientData,

  int vtkTkImageViewerWidget_Widget(ClientData clientData,

                                    Tcl_Interp *interp,

                                    Tcl_Interp *interp,

                                    int argc,

                                    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

                                    CONST84

#endif

#endif

                                    char *argv[])

                                    char *argv[])

Lines 178-184	Link Here

        result = vtkTkImageViewerWidget_Configure(interp,

        result = vtkTkImageViewerWidget_Configure(interp,

                                                  self,

                                                  self,

                                                  argc-2,

                                                  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),

                                                  const_cast<char **>(argv+2),

#else

#else

                                                  argv+2,

                                                  argv+2,

Lines 224-235	Link Here

  int vtkTkImageViewerWidget_Cmd(ClientData clientData,

  int vtkTkImageViewerWidget_Cmd(ClientData clientData,

                                 Tcl_Interp *interp,

                                 Tcl_Interp *interp,

                                 int argc,

                                 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

                                 CONST84

#endif

#endif

                                 char **argv)

                                 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

    CONST84

#endif

#endif

    char *name;

    char *name;

Lines 281-287	Link Here

    if (vtkTkImageViewerWidget_Configure(interp,

    if (vtkTkImageViewerWidget_Configure(interp,

                                         self,

                                         self,

                                         argc-2,

                                         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),

                                         const_cast<char **>(argv+2),

#else

#else

                                         argv+2,

                                         argv+2,

(-) VTK/Rendering/vtkTkRenderWidget.cxx (-7 / +7 lines)

Lines 128-134	Link Here

  int vtkImageDataToTkPhoto_Cmd (ClientData vtkNotUsed(clientData),

  int vtkImageDataToTkPhoto_Cmd (ClientData vtkNotUsed(clientData),

                                 Tcl_Interp *interp,

                                 Tcl_Interp *interp,

                                 int argc,

                                 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

                                 CONST84

#endif

#endif

                                 char **argv)

                                 char **argv)

Lines 361-367	Link Here

                         self->TkWin,

                         self->TkWin,

                         vtkTkRenderWidgetConfigSpecs,

                         vtkTkRenderWidgetConfigSpecs,

                         argc,

                         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),

                         const_cast<CONST84 char **>(argv),

#else

#else

                         argv,

                         argv,

Lines 393-399	Link Here

  int vtkTkRenderWidget_Widget(ClientData clientData,

  int vtkTkRenderWidget_Widget(ClientData clientData,

                               Tcl_Interp *interp,

                               Tcl_Interp *interp,

                               int argc,

                               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

                               CONST84

#endif

#endif

                               char *argv[])

                               char *argv[])

Lines 444-450	Link Here

        /* Execute a configuration change */

        /* Execute a configuration change */

        result = vtkTkRenderWidget_Configure(interp, self, argc-2,

        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),

                                             const_cast<char **>(argv+2),

#else

#else

                                             argv+2,

                                             argv+2,

Lines 490-501	Link Here

  int vtkTkRenderWidget_Cmd(ClientData clientData,

  int vtkTkRenderWidget_Cmd(ClientData clientData,

                            Tcl_Interp *interp,

                            Tcl_Interp *interp,

                            int argc,

                            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

                            CONST84

#endif

#endif

                            char **argv)

                            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

    CONST84

#endif

#endif

    char *name;

    char *name;

Lines 545-551	Link Here

    if (vtkTkRenderWidget_Configure(interp,

    if (vtkTkRenderWidget_Configure(interp,

                                    self,

                                    self,

                                    argc-2,

                                    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),

                                    const_cast<char **>(argv+2),

#else

#else

                                    argv+2,

                                    argv+2,

(-) VTK/Wrapping/vtkWrapTclInit.c (-1 / +1 lines)

Lines 49-55	Link Here

  fprintf(fout,

  fprintf(fout,

    "extern \"C\"\n"

    "extern \"C\"\n"

    "{\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"

    "  typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, CONST84 char *[]);\n"

    "#else\n"

    "#else\n"

    "  typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, char *[]);\n"

    "  typedef int (*vtkTclCommandType)(ClientData, Tcl_Interp *,int, char *[]);\n"

Attachment #145580: vtk-tcl8.5.patch for bug #212700