summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2011-01-19 14:02:19 (GMT)
committernijtmans <nijtmans>2011-01-19 14:02:19 (GMT)
commit846cac3a5896e94923fee07d2004efec4f73effc (patch)
tree80212e180ac0ac3b483e4eac20dccffb01f5aac4
parentcec54eeb88fbfdfbaca596a2d81ca64d71a18ece (diff)
downloadtcl-846cac3a5896e94923fee07d2004efec4f73effc.zip
tcl-846cac3a5896e94923fee07d2004efec4f73effc.tar.gz
tcl-846cac3a5896e94923fee07d2004efec4f73effc.tar.bz2
Make sure to use CONST/VOID in stead of
const/void when appropriate. This allows to use const/void in the *.decls file always, genStubs will do the right thing.
-rw-r--r--generic/tclIntDecls.h10
-rw-r--r--tools/genStubs.tcl10
2 files changed, 10 insertions, 10 deletions
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 9933fd5..1811cd3 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIntDecls.h,v 1.112.2.7 2011/01/19 08:04:49 nijtmans Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.112.2.8 2011/01/19 14:02:19 nijtmans Exp $
*/
#ifndef _TCLINTDECLS
@@ -725,7 +725,7 @@ EXTERN void TclChannelEventScriptInvoker(ClientData clientData,
#ifndef TclGetInstructionTable_TCL_DECLARED
#define TclGetInstructionTable_TCL_DECLARED
/* 163 */
-EXTERN void * TclGetInstructionTable(void);
+EXTERN VOID * TclGetInstructionTable(void);
#endif
#ifndef TclExpandCodeArray_TCL_DECLARED
#define TclExpandCodeArray_TCL_DECLARED
@@ -925,7 +925,7 @@ EXTERN void TclSetObjNameOfExecutable(Tcl_Obj *name,
#ifndef TclStackAlloc_TCL_DECLARED
#define TclStackAlloc_TCL_DECLARED
/* 215 */
-EXTERN void * TclStackAlloc(Tcl_Interp *interp, int numBytes);
+EXTERN VOID * TclStackAlloc(Tcl_Interp *interp, int numBytes);
#endif
#ifndef TclStackFree_TCL_DECLARED
#define TclStackFree_TCL_DECLARED
@@ -1219,7 +1219,7 @@ typedef struct TclIntStubs {
void *reserved160;
int (*tclChannelTransform) (Tcl_Interp *interp, Tcl_Channel chan, Tcl_Obj *cmdObjPtr); /* 161 */
void (*tclChannelEventScriptInvoker) (ClientData clientData, int flags); /* 162 */
- void * (*tclGetInstructionTable) (void); /* 163 */
+ VOID * (*tclGetInstructionTable) (void); /* 163 */
void (*tclExpandCodeArray) (VOID *envPtr); /* 164 */
void (*tclpSetInitialEncodings) (void); /* 165 */
int (*tclListObjSetElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, int index, Tcl_Obj *valuePtr); /* 166 */
@@ -1271,7 +1271,7 @@ typedef struct TclIntStubs {
void (*tclpFindExecutable) (CONST char *argv0); /* 212 */
Tcl_Obj * (*tclGetObjNameOfExecutable) (void); /* 213 */
void (*tclSetObjNameOfExecutable) (Tcl_Obj *name, Tcl_Encoding encoding); /* 214 */
- void * (*tclStackAlloc) (Tcl_Interp *interp, int numBytes); /* 215 */
+ VOID * (*tclStackAlloc) (Tcl_Interp *interp, int numBytes); /* 215 */
void (*tclStackFree) (Tcl_Interp *interp, VOID *freePtr); /* 216 */
int (*tclPushStackFrame) (Tcl_Interp *interp, Tcl_CallFrame **framePtrPtr, Tcl_Namespace *namespacePtr, int isProcCallFrame); /* 217 */
void (*tclPopStackFrame) (Tcl_Interp *interp); /* 218 */
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 43c65e4..b4fe22a 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: genStubs.tcl,v 1.22.2.6 2011/01/19 08:04:49 nijtmans Exp $
+# RCS: @(#) $Id: genStubs.tcl,v 1.22.2.7 2011/01/19 14:02:19 nijtmans Exp $
package require Tcl 8.4
@@ -411,8 +411,8 @@ proc genStubs::makeDecl {name decl index} {
lassign $decl rtype fname args
append text "/* $index */\n"
- if {$rtype eq "VOID"} {
- set rtype void
+ if {$rtype != "void"} {
+ regsub -all void $rtype VOID rtype
}
set line "EXTERN $rtype"
set count [expr {2 - ([string length $line] / 8)}]
@@ -530,8 +530,8 @@ proc genStubs::makeSlot {name decl index} {
append lfname [string range $fname 1 end]
set text " "
- if {$rtype eq "VOID"} {
- set rtype void
+ if {$rtype != "void"} {
+ regsub -all void $rtype VOID rtype
}
if {$args == ""} {
append text $rtype " *" $lfname "; /* $index */\n"