akr	2011-11-17 20:45:32 +0900 (Thu, 17 Nov 2011)

  New Revision: 33779

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33779

  Log:
    * 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].

  Modified files:
    trunk/ChangeLog
    trunk/ext/dbm/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33778)
+++ ChangeLog	(revision 33779)
@@ -1,3 +1,8 @@
+Thu Nov 17 20:43:34 2011  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* benchmark/bm_io_select[23].rb: use Process::RLIMIT_NOFILE only when
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 33778)
+++ ext/dbm/extconf.rb	(revision 33779)
@@ -50,7 +50,7 @@
     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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/