diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-11-16 10:12:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-11-16 10:12:05 (GMT) |
| commit | d82bd0ad8d88a2f44c08c6689823a5d53d888e44 (patch) | |
| tree | 38d09973843ea0813935bd32c8d11e34b88f8a0e /tools | |
| parent | ba0f4e5c1831f33002465cead9a984383aa6da82 (diff) | |
| parent | 1e8c676e12346c0db746226bcf3be0d74db2b967 (diff) | |
| download | tcl-d82bd0ad8d88a2f44c08c6689823a5d53d888e44.zip tcl-d82bd0ad8d88a2f44c08c6689823a5d53d888e44.tar.gz tcl-d82bd0ad8d88a2f44c08c6689823a5d53d888e44.tar.bz2 | |
Merge trunk
<p>Fix Windows build
<p>Now usable with Thread's "novem" branch (3.0a1)
<p>Remove some more deprecated stuff
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/genStubs.tcl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl index fdee5db..6ce4243 100644 --- a/tools/genStubs.tcl +++ b/tools/genStubs.tcl @@ -828,7 +828,7 @@ proc genStubs::forAllStubs {name slotProc onAll textVar append text [addPlatformGuard $plat $temp {} true] } ## macosx ## - if {$block(macosx) && !$block(aqua) && !$block(x11)} { + if {($block(unix) || $block(macosx)) && !$block(aqua) && !$block(x11)} { set temp {} set lastNum -1 foreach plat {unix macosx} { @@ -986,7 +986,7 @@ proc genStubs::emitHeader {name} { emitDeclarations $name text if {[info exists hooks($name)]} { - append text "\ntypedef struct ${capName}StubHooks {\n" + append text "\ntypedef struct {\n" foreach hook $hooks($name) { set capHook [string toupper [string index $hook 0]] append capHook [string range $hook 1 end] @@ -1000,7 +1000,11 @@ proc genStubs::emitHeader {name} { append text " int epoch;\n" append text " int revision;\n" } - append text " const struct ${capName}StubHooks *hooks;\n\n" + if {[info exists hooks($name)]} { + append text " const ${capName}StubHooks *hooks;\n\n" + } else { + append text " void *hooks;\n\n" + } emitSlots $name text |