nobu	2011-11-13 23:47:31 +0900 (Sun, 13 Nov 2011)

  New Revision: 33738

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

  Log:
    * ext/dbm/extconf.rb: use convertible_int.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33737)
+++ ChangeLog	(revision 33738)
@@ -1,3 +1,7 @@
+Sun Nov 13 23:47:29 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/dbm/extconf.rb: use convertible_int.
+
 Sun Nov 13 23:45:57 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (checking_for): should not modify the result.
Index: ext/dbm/dbm.c
===================================================================
--- ext/dbm/dbm.c	(revision 33737)
+++ ext/dbm/dbm.c	(revision 33738)
@@ -21,12 +21,11 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#if SIZEOF_DSIZE > SIZEOF_INT
-# define DSIZE_TYPE long
+#define DSIZE_TYPE TYPEOF_DATUM_DSIZE
+#if SIZEOF_DATUM_DSIZE > SIZEOF_INT
 # define RSTRING_DSIZE(s) RSTRING_LEN(s)
 # define TOO_LONG(n) 0
 #else
-# define DSIZE_TYPE int
 # define RSTRING_DSIZE(s) RSTRING_LENINT(s)
 # define TOO_LONG(n) ((long)(+(DSIZE_TYPE)(n)) != (n))
 #endif
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 33737)
+++ ext/dbm/extconf.rb	(revision 33738)
@@ -71,12 +71,6 @@
   have_header("sys/cdefs.h")
   have_func("dbm_pagfno((DBM *)0)", headers.found, headers.defs)
   have_func("dbm_dirfno((DBM *)0)", headers.found, headers.defs)
-  type = checking_for "sizeof(datum.dsize)", STRING_OR_FAILED_FORMAT do
-    pre = headers.found + [["static datum conftest_key;"]]
-    %w[int long LONG_LONG].find do |t|
-      try_static_assert("sizeof(conftest_key.dsize) <= sizeof(#{t})", pre, headers.defs)
-    end
-  end
-  $defs << "-DSIZEOF_DSIZE=SIZEOF_"+type.tr_cpp if type
+  convertible_int("datum.dsize", headers.found, headers.defs)
   create_makefile("dbm")
 end

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