diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2012-11-20 12:13:43 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2012-11-20 12:13:43 (GMT) |
| commit | 3e55ef9d38f9ad0ce68ab947b51a37b144046100 (patch) | |
| tree | fb090e3289193ec27321e51dab2e78b60ac9de05 /tools/genStubs.tcl | |
| parent | abcad102a592db423039b297a5885beb9034ad5b (diff) | |
| parent | 884171d33416e69905bbb16e8734dd1d760ed08a (diff) | |
| download | tcl-3e55ef9d38f9ad0ce68ab947b51a37b144046100.zip tcl-3e55ef9d38f9ad0ce68ab947b51a37b144046100.tar.gz tcl-3e55ef9d38f9ad0ce68ab947b51a37b144046100.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 |