[前][次][番号順一覧][スレッド一覧]

ruby-changes:21677

From: nobu <ko1@a...>
Date: Sat, 12 Nov 2011 17:02:01 +0900 (JST)
Subject: [ruby-changes:21677] nobu:r33726 (trunk): * ext/dbm/extconf.rb (headers.db_check): reduce duplicated code.

nobu	2011-11-12 17:01:51 +0900 (Sat, 12 Nov 2011)

  New Revision: 33726

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

  Log:
    * ext/dbm/extconf.rb (headers.db_check): reduce duplicated code.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33725)
+++ ChangeLog	(revision 33726)
@@ -1,3 +1,7 @@
+Sat Nov 12 17:01:49 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/dbm/extconf.rb (headers.db_check): reduce duplicated code.
+
 Sat Nov 12 15:59:42 2011  Tanaka Akira  <akr@f...>
 
 	* ext/dbm/extconf.rb: dbm_clearerr should be available in all ndbm
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 33725)
+++ ext/dbm/extconf.rb	(revision 33726)
@@ -39,8 +39,8 @@
     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
+  hdrs = self.fetch(db, ["ndbm.h"])
+  if (hdr = hdrs.find {|h| have_type("DBM", h, hsearch)} || hdrs.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)) and
      have_func('dbm_clearerr((DBM *)0)', hdr, hsearch)
     if hsearch

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

[前][次][番号順一覧][スレッド一覧]