naruse	2012-02-17 10:16:19 +0900 (Fri, 17 Feb 2012)

  New Revision: 34654

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

  Log:
    merge revision(s) 34644:
    
    * ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
      Berkeley DB library.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/dbm/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34653)
+++ ruby_1_9_3/ChangeLog	(revision 34654)
@@ -1,3 +1,8 @@
+Fri Feb 17 10:15:54 2012  Tanaka Akira  <akr@f...>
+
+	* ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
+	  Berkeley DB library.
+
 Fri Feb 17 10:14:47 2012  Tanaka Akira  <akr@f...>
 
 	* test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior.
Index: ruby_1_9_3/ext/dbm/extconf.rb
===================================================================
--- ruby_1_9_3/ext/dbm/extconf.rb	(revision 34653)
+++ ruby_1_9_3/ext/dbm/extconf.rb	(revision 34654)
@@ -250,7 +250,8 @@
   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)
+     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.
     case db
     when /\Adb\d?\z/
       have_func('db_version((int *)0, (int *)0, (int *)0)', hdr, hsearch)
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34653)
+++ ruby_1_9_3/version.h	(revision 34654)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 128
+#define RUBY_PATCHLEVEL 129
 
 #define RUBY_RELEASE_DATE "2012-02-17"
 #define RUBY_RELEASE_YEAR 2012

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