Tcl Source Code

Artifact [ee23a6c07a]
Login

Artifact ee23a6c07a56762230d51fad89881522f0285ea8:

Attachment "2965424.patch" to ticket [2965424fff] added by nijtmans 2010-03-08 20:24:46.
*** tclOODecls.h.orig	2010-03-02 22:43:10.885000000 +0100
--- tclOODecls.h	2010-03-08 14:17:36.816297548 +0100
***************
*** 25,35 ****
   */
  
  #if defined(USE_TCLOO_STUBS)
! extern const char *TclOOInitializeStubs(Tcl_Interp *, const char *version);
! #define Tcl_OOInitStubs(interp) TclOOInitializeStubs((interp),TCLOO_VERSION)
  #else
! #define Tcl_OOInitStubs(interp) \
! 	Tcl_PkgRequire((interp),"TclOO",TCLOO_VERSION,0)
  #endif
  
  /* !BEGIN!: Do not edit below this line. */
--- 25,36 ----
   */
  
  #if defined(USE_TCLOO_STUBS)
! extern const char *TclOOInitializeStubs(Tcl_Interp *, const char *version, int exact);
! #define Tcl_OOInitStubs(interp,version,exact) \
! 	TclOOInitializeStubs((interp), (version), (exact))
  #else
! #define Tcl_OOInitStubs(interp, version, exact) \
! 	Tcl_PkgRequire((interp),"TclOO", (version), (exact))
  #endif
  
  /* !BEGIN!: Do not edit below this line. */
*** tclOOStubLib.c.orig	2010-03-02 22:43:10.004000000 +0100
--- tclOOStubLib.c	2010-03-08 14:16:15.935688354 +0100
***************
*** 43,57 ****
  
  MODULE_SCOPE const char *
  TclOOInitializeStubs(
!     Tcl_Interp *interp, const char *version)
  {
-     int exact = 0;
      const char *packageName = "TclOO";
      const char *errMsg = NULL;
      ClientData clientData = NULL;
!     const char *actualVersion =
  	    Tcl_PkgRequireEx(interp, packageName,version, exact, &clientData);
- 
      if (clientData == NULL) {
  	Tcl_ResetResult(interp);
  	Tcl_AppendResult(interp, "Error loading ", packageName, " package; ",
--- 43,60 ----
  
  MODULE_SCOPE const char *
  TclOOInitializeStubs(
!     Tcl_Interp *interp, const char *version, int exact)
  {
      const char *packageName = "TclOO";
      const char *errMsg = NULL;
      ClientData clientData = NULL;
!     const char *actualVersion;
!     exact = 0; /* for now, don't use this parameter, in order to keep
!                 * binary compatibility with already-compiled extensions.
!                 * TODO: Remove this line for TclOO 1.0.
!                 */
!     actualVersion =
  	    Tcl_PkgRequireEx(interp, packageName,version, exact, &clientData);
      if (clientData == NULL) {
  	Tcl_ResetResult(interp);
  	Tcl_AppendResult(interp, "Error loading ", packageName, " package; ",