1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/dbm/extconf.rb: refactored to split too long conditions.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34647 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-02-16 22:32:10 +00:00
parent d698ea8991
commit 2f92a267f4
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Feb 17 07:30:53 2012 Tanaka Akira <akr@fsij.org>
* ext/dbm/extconf.rb: refactored to split too long conditions.
Fri Feb 17 00:23:25 2012 Tanaka Akira <akr@fsij.org> Fri Feb 17 00:23:25 2012 Tanaka Akira <akr@fsij.org>
* test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior. * test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior.

27
ext/dbm/extconf.rb
View File

@ -76,11 +76,24 @@ def headers.db_check2(db, hdr)
have_library("gdbm") or return false have_library("gdbm") or return false
end end
if have_type("DBM", hdr, hsearch) and if !have_type("DBM", hdr, hsearch)
(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) : return false
have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch)) and end
have_func('dbm_clearerr((DBM *)0)', hdr, hsearch) and
(/\Adb\d?\z/ =~ db || db == 'libc' || !have_macro('_DB_H_', hdr, hsearch)) # _DB_H_ should not be defined except Berkeley DB. if !(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) :
have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch))
return false
end
if !have_func('dbm_clearerr((DBM *)0)', hdr, hsearch)
return false
end
# _DB_H_ should not be defined except Berkeley DB.
if !(/\Adb\d?\z/ =~ db || db == 'libc' || !have_macro('_DB_H_', hdr, hsearch))
return false
end
case db case db
when /\Adb\d?\z/ when /\Adb\d?\z/
have_func('db_version((int *)0, (int *)0, (int *)0)', hdr, hsearch) have_func('db_version((int *)0, (int *)0, (int *)0)', hdr, hsearch)
@ -99,10 +112,8 @@ def headers.db_check2(db, hdr)
end end
$defs << '-DDBM_HDR="<'+hdr+'>"' $defs << '-DDBM_HDR="<'+hdr+'>"'
@found << hdr @found << hdr
true true
else
false
end
end end
if dblib.any? {|db| headers.fetch(db, ["ndbm.h"]).any? {|hdr| headers.db_check(db, hdr) } } if dblib.any? {|db| headers.fetch(db, ["ndbm.h"]).any? {|hdr| headers.db_check(db, hdr) } }