diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-11-20 12:14:18 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-11-20 12:14:18 (GMT) |
| commit | 0d9c3c6fea70ee5c02ec0c52388a1914bca1ff4c (patch) | |
| tree | 952243458095cfc9400e26863f34f2177d5e7d62 /tools/genStubs.tcl | |
| parent | da8e7d4661b94a3128d7ec74ba87a13d6e11ec8b (diff) | |
| parent | 6ba5327e8579861a348ee361e3aff04356086458 (diff) | |
| download | tcl-0d9c3c6fea70ee5c02ec0c52388a1914bca1ff4c.zip tcl-0d9c3c6fea70ee5c02ec0c52388a1914bca1ff4c.tar.gz tcl-0d9c3c6fea70ee5c02ec0c52388a1914bca1ff4c.tar.bz2 | |
merge dkf-compile-misc-info
Diffstat (limited to 'tools/genStubs.tcl')
| -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 dea63e6..93e0a9a 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 |