summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-15 15:00:14 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-15 15:00:14 (GMT)
commita06d3694d5af51acabffa650a8aaaa30e199d130 (patch)
treebba6dc6a2219db714d4413de45a1aa2101da03ce
parent67d9f4bf6ea825790cc022a9de7cb489e497afa3 (diff)
downloadtcl-a06d3694d5af51acabffa650a8aaaa30e199d130.zip
tcl-a06d3694d5af51acabffa650a8aaaa30e199d130.tar.gz
tcl-a06d3694d5af51acabffa650a8aaaa30e199d130.tar.bz2
Fix bug in genStubs.tcl: If the macosx section doesn't contain any macosx-specific entries, no section at all is created
<p>revert previous workaround in tclInt.decls
-rw-r--r--generic/tclInt.decls2
-rw-r--r--tools/genStubs.tcl2
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index a176bca..bdae099 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -903,7 +903,7 @@ declare 12 unix {
declare 13 unix {
char *TclpInetNtoa(struct in_addr addr)
}
-declare 29 {macosx unix} {
+declare 29 unix {
int TclWinCPUID(unsigned int index, unsigned int *regs)
}
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index c29f6c9..db26629 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -827,7 +827,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} {