diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-11-04 08:39:57 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-11-04 08:39:57 +0000 |
| commit | a9e9697994a08600f5dbb46a1fe2a07233cb4890 (patch) | |
| tree | 9976842c343a888dc34f5cc53ecedc5abb358669 /ext | |
| parent | 0d684beafb4258da9606b1e3b4448511b709a2e2 (diff) | |
19991104
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dbm/dbm.c | 10 | ||||
| -rw-r--r-- | ext/tcltklib/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/tk/lib/tkfont.rb | 15 |
3 files changed, 23 insertions, 4 deletions
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index 4d83cec1b1..1240f4b9ab 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -72,12 +72,16 @@ fdbm_s_open(argc, argv, klass) Check_SafeStr(file); dbm = 0; - if (mode >= 0) + if (mode >= 0) { dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode); - if (!dbm) + } + if (!dbm) { + mode = 0666; dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, mode); - if (!dbm) + } + if (!dbm) { dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, mode); + } if (!dbm) { if (mode == -1) return Qnil; diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index e1086855ba..713cc811e5 100644 --- a/ext/tcltklib/extconf.rb +++ b/ext/tcltklib/extconf.rb @@ -21,6 +21,7 @@ def find_tcl(tcllib) find_library(tcllib, func, *paths) else find_library("tcl", func, *paths) or + find_library("tcl8.2", func, *paths) or find_library("tcl8.0", func, *paths) or find_library("tcl7.6", func, *paths) end @@ -33,6 +34,7 @@ def find_tk(tklib) find_library(tklib, func, *paths) else find_library("tk", func, *paths) or + find_library("tk8.2", func, *paths) or find_library("tk8.0", func, *paths) or find_library("tk4.2", func, *paths) end diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb index c680d166e7..2683260d69 100644 --- a/ext/tk/lib/tkfont.rb +++ b/ext/tk/lib/tkfont.rb @@ -667,7 +667,20 @@ class TkFont alias measure_core measure_core_tk8x alias metrics_core metrics_core_tk8x - when /^8\.1/ + when /^8\.[12]/ + alias create_latinfont create_latinfont_tk8x + alias create_kanjifont create_kanjifont_tk81 + alias create_compoundfont create_compoundfont_tk81 + alias actual_core actual_core_tk8x + alias configure_core configure_core_tk8x + alias configinfo_core configinfo_core_tk8x + alias delete_core delete_core_tk8x + alias latin_replace_core latin_replace_core_tk8x + alias kanji_replace_core kanji_replace_core_tk81 + alias measure_core measure_core_tk8x + alias metrics_core metrics_core_tk8x + + when /^8\.*/ alias create_latinfont create_latinfont_tk8x alias create_kanjifont create_kanjifont_tk81 alias create_compoundfont create_compoundfont_tk81 |