summaryrefslogtreecommitdiff
path: root/ext/dbm/extconf.rb
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-12 07:06:09 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-12 07:06:09 +0000
commitdf2e1f85d2192be61eb5a8f8cb9663f47769101b (patch)
tree30a7433b9e41a724fd0bcd8472b780ffb64a911a /ext/dbm/extconf.rb
parent5c29d116c2d1dac5c6953bb60a3bda35df51d713 (diff)
* ext/dbm/extconf.rb: dbm_clearerr should be available in all ndbm
implementation. If it is not available, it is caused by header/library mismatch such that Berkeley DB header & gdbm library. * ext/dbm/dbm.c (fdbm_store): use dbm_clearerr() unconditionally. gdbm 1.9 provides it as a real function instead of a empty macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dbm/extconf.rb')
-rw-r--r--ext/dbm/extconf.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index a2c3b7c..5c6c183 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -29,23 +29,20 @@ headers.found = []
headers.defs = nil
def headers.db_check(db)
- have_gdbm = false
hsearch = nil
case db
when /^db[2-5]?$/
hsearch = "-DDB_DBM_HSEARCH"
when "gdbm"
- have_gdbm = true
when "gdbm_compat"
- have_gdbm = true
have_library("gdbm") or return false
end
if (hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)} or
hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", ["db.h", h], hsearch)}) and
- (have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch) || have_func('dbm_open("", 0, 0)', hdr, hsearch))
- have_func('dbm_clearerr((DBM *)0)', hdr, hsearch) unless have_gdbm
+ (have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch) || have_func('dbm_open("", 0, 0)', hdr, hsearch)) and
+ have_func('dbm_clearerr((DBM *)0)', hdr, hsearch)
if hsearch
$defs << hsearch
@defs = hsearch