From 266d09839b436b2ecc1d95456db4771b5a8119db Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 11 Nov 2011 12:03:51 +0000 Subject: * ext/dbm/extconf.rb: fix dbm_pagfno and dbm_dirfno detection with Berkeley DB. Macro definitions needs arguments to detect correctly. SIZEOF_DSIZE needs -DDB_DBM_HSEARCH because db.h defines datum type only if DB_DBM_HSEARCH is defined. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/dbm/extconf.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/dbm/extconf.rb') diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb index fb722a3c39..608f4d472f 100644 --- a/ext/dbm/extconf.rb +++ b/ext/dbm/extconf.rb @@ -64,12 +64,12 @@ end if dblib.any? {|db| headers.db_check(db)} have_header("cdefs.h") have_header("sys/cdefs.h") - have_func("dbm_pagfno", headers.found, headers.defs) - have_func("dbm_dirfno", headers.found, headers.defs) + 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) + try_static_assert("sizeof(conftest_key.dsize) <= sizeof(#{t})", pre, headers.defs) end end $defs << "-DSIZEOF_DSIZE=SIZEOF_"+type.tr_cpp if type -- cgit v1.2.3