summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-01-29 14:53:36 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-01-29 14:53:36 (GMT)
commit7d0d8f85ee8ad595801e30135e4cde40d6707ccd (patch)
tree4854cdcbf0ad2f0ac7da5edd7fe0e9e018a4e1b1
parent3b86ebefcc042ab38755eb162fc0a07b68d5f20e (diff)
downloadtcl-7d0d8f85ee8ad595801e30135e4cde40d6707ccd.zip
tcl-7d0d8f85ee8ad595801e30135e4cde40d6707ccd.tar.gz
tcl-7d0d8f85ee8ad595801e30135e4cde40d6707ccd.tar.bz2
Fix [Bug 2537839]
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclOODecls.h15
2 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 59854fb..31c69d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-29 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tclOODecls.h (Tcl_OOInitStubs): [Bug 2537839]: Make the
+ declaration of this macro work correctly in the non-stub case.
+
2009-01-29 Don Porter <dgp@users.sourceforge.net>
* generic/tclInterp.c: Convert the [interp] command into a
diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h
index 4cdd515..1a0c262 100644
--- a/generic/tclOODecls.h
+++ b/generic/tclOODecls.h
@@ -1,10 +1,9 @@
/*
- * $Id: tclOODecls.h,v 1.10 2008/10/22 20:23:59 nijtmans Exp $
+ * $Id: tclOODecls.h,v 1.11 2009/01/29 14:53:36 dkf Exp $
*
* This file is (mostly) automatically generated from tclOO.decls.
*/
-
#ifndef _TCLOODECLS
#define _TCLOODECLS
@@ -21,20 +20,18 @@
/*
* WARNING: This file is automatically generated by the tools/genStubs.tcl
- * script. Any modifications to the function declarations below should be made
+ * script. Any modifications to the function declarations below should be made
* in the generic/tclOO.decls script.
*/
-
-
#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)
+#define Tcl_OOInitStubs(interp) \
+ Tcl_PkgRequire((interp),"TclOO",TCLOO_VERSION,0)
#endif
-
-
+
/* !BEGIN!: Do not edit below this line. */
/*
@@ -375,7 +372,7 @@ extern const TclOOStubs *tclOOStubsPtr;
#endif /* defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS) */
/* !END!: Do not edit above this line. */
-
+
#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT