summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/dbm/extconf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dd6c3d3..0b0af93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 17 20:43:34 2011 Tanaka Akira <akr@fsij.org>
+
+ * ext/dbm/extconf.rb: revert a part of the patch in [ruby-dev:41531].
+ don't use db.h with other headers. [ruby-dev:44884].
+
Thu Nov 17 20:23:03 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* benchmark/bm_io_select[23].rb: use Process::RLIMIT_NOFILE only when
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index e0c27a3..ba5cfe4 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -50,7 +50,7 @@ def headers.db_check2(db, hdr)
have_library("gdbm") or return false
end
- if (have_type("DBM", hdr, hsearch) || have_type("DBM", ["db.h", hdr], hsearch)) and
+ if have_type("DBM", hdr, hsearch) and
(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) :
have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch)) and
have_func('dbm_clearerr((DBM *)0)', hdr, hsearch)