summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-03-07 14:39:25 (GMT)
committernijtmans <nijtmans>2010-03-07 14:39:25 (GMT)
commit646fc65d90e21ea34b47fee9ef22f8fbaf4e40ca (patch)
tree613fc83e151efdbb14c37fbfb42d5f8aa355642d /generic
parente0f4b9aef0aed9b336779d768d41cf8fba52f137 (diff)
downloadtcl-646fc65d90e21ea34b47fee9ef22f8fbaf4e40ca.zip
tcl-646fc65d90e21ea34b47fee9ef22f8fbaf4e40ca.tar.gz
tcl-646fc65d90e21ea34b47fee9ef22f8fbaf4e40ca.tar.bz2
test that tclOO stubs are present in stub library
Applied missing part of [Patch 2961556] Change all tclWinProcs signatures to use TCHAR* in stead of WCHAR*. This is meant as preparation to make [Enh 2965056] possible at all.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclOOMethod.c10
-rw-r--r--generic/tclTest.c9
2 files changed, 11 insertions, 8 deletions
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index bc6bd86..6c13116 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclOOMethod.c,v 1.24 2010/02/24 10:45:04 dkf Exp $
+ * RCS: @(#) $Id: tclOOMethod.c,v 1.25 2010/03/07 14:39:26 nijtmans Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1655,8 +1655,8 @@ Tcl_Method
TclOONewProcInstanceMethodEx(
Tcl_Interp *interp, /* The interpreter containing the object. */
Tcl_Object oPtr, /* The object to modify. */
- TclOO_PreCallProc preCallPtr,
- TclOO_PostCallProc postCallPtr,
+ TclOO_PreCallProc *preCallPtr,
+ TclOO_PostCallProc *postCallPtr,
ProcErrorProc *errProc,
ClientData clientData,
Tcl_Obj *nameObj, /* The name of the method, which must not be
@@ -1692,8 +1692,8 @@ Tcl_Method
TclOONewProcMethodEx(
Tcl_Interp *interp, /* The interpreter containing the class. */
Tcl_Class clsPtr, /* The class to modify. */
- TclOO_PreCallProc preCallPtr,
- TclOO_PostCallProc postCallPtr,
+ TclOO_PreCallProc *preCallPtr,
+ TclOO_PostCallProc *postCallPtr,
ProcErrorProc *errProc,
ClientData clientData,
Tcl_Obj *nameObj, /* The name of the method, which may be NULL;
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 35bff84..4e717bd 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTest.c,v 1.148 2010/03/06 06:29:24 nijtmans Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.149 2010/03/07 14:39:26 nijtmans Exp $
*/
#undef STATIC_BUILD
@@ -22,7 +22,7 @@
# define USE_TCL_STUBS
#endif
#include "tclInt.h"
-
+#include "tclOO.h"
/*
* Required for Testregexp*Cmd
*/
@@ -545,6 +545,9 @@ Tcltest_Init(
if (Tcl_TomMath_InitStubs(interp, "8.5") == NULL) {
return TCL_ERROR;
}
+ if (Tcl_OOInitStubs(interp) == NULL) {
+ return TCL_ERROR;
+ }
/* TIP #268: Full patchlevel instead of just major.minor */
if (Tcl_PkgProvide(interp, "Tcltest", TCL_PATCH_LEVEL) == TCL_ERROR) {
@@ -757,7 +760,7 @@ int
Tcltest_SafeInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
- if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
return TCL_ERROR;
}
return Procbodytest_SafeInit(interp);