summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-10-19 15:52:42 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-10-19 15:52:42 (GMT)
commitcb061edef8250a8cd969eb0eb291f4c44d65d74e (patch)
tree455706cb2d9601f75814f097357920b6bb3ced5a /tools
parentfca6e38924437639527aca6bdeb434a00f3169ea (diff)
parent49aba3d99eb7035ee260003ddc27728b26962d43 (diff)
downloadtcl-cb061edef8250a8cd969eb0eb291f4c44d65d74e.zip
tcl-cb061edef8250a8cd969eb0eb291f4c44d65d74e.tar.gz
tcl-cb061edef8250a8cd969eb0eb291f4c44d65d74e.tar.bz2
Merge 8.6
Diffstat (limited to 'tools')
-rw-r--r--tools/genStubs.tcl12
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 830ba2b..f2f410f 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -198,6 +198,13 @@ proc genStubs::declare {args} {
|| ($index > $stubs($curName,generic,lastNum))} {
set stubs($curName,generic,lastNum) $index
}
+ } elseif {([lindex $platformList 0] eq "nostub")} {
+ set stubs($curName,nostub,$index) [lindex $platformList 1]
+ set stubs($curName,generic,$index) $decl
+ if {![info exists stubs($curName,generic,lastNum)] \
+ || ($index > $stubs($curName,generic,lastNum))} {
+ set stubs($curName,generic,lastNum) $index
+ }
} else {
foreach platform $platformList {
if {$decl ne ""} {
@@ -593,6 +600,8 @@ proc genStubs::makeSlot {name decl index} {
set text " "
if {[info exists stubs($name,deprecated,$index)]} {
append text "TCL_DEPRECATED_API(\"$stubs($name,deprecated,$index)\") "
+ } elseif {[info exists stubs($name,nostub,$index)]} {
+ append text "TCL_DEPRECATED_API(\"$stubs($name,nostub,$index)\") "
}
if {$args eq ""} {
append text $rtype " *" $lfname "; /* $index */\n"
@@ -705,6 +714,9 @@ proc genStubs::forAllStubs {name slotProc onAll textVar
if {[info exists stubs($name,deprecated,$i)]} {
append text [$slotProc $name $stubs($name,generic,$i) $i]
set emit 1
+ } elseif {[info exists stubs($name,nostub,$i)]} {
+ append text [$slotProc $name $stubs($name,generic,$i) $i]
+ set emit 1
} elseif {[info exists stubs($name,generic,$i)]} {
if {[llength $slots] > 1} {
puts stderr "conflicting generic and platform entries:\