diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-18 09:47:07 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-18 09:47:07 +0000 |
| commit | fc0111cce1bc77a277b1f098027a898a919f0981 (patch) | |
| tree | 6df5dd2958fda676a325e24d9e8c225966903e5b /ext/dbm/dbm.c | |
| parent | 4c1ea85dd892fa557205d0c85b60e59415cc2ae8 (diff) | |
| download | ruby-fc0111cce1bc77a277b1f098027a898a919f0981.tar.gz | |
* ext/dbm/extconf.rb (dblib): prefer recent GDBM over older GDBM.
(have_declared_libvar): new function to check a declared variable
exists in a library.
(have_undeclared_libvar): renamed from renamed from have_libvar.
(headers.db_check2): check that GDBM version variable if GDBM header
is choosen.
* ext/dbm/dbm.c (Init_dbm): use HAVE_DECLARED_LIBVAR_GDBM_VERSION and
HAVE_UNDECLARED_LIBVAR_GDBM_VERSION macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dbm/dbm.c')
| -rw-r--r-- | ext/dbm/dbm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index 98de538dd0..1091020ec3 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -1082,10 +1082,10 @@ Init_dbm(void) #if defined(HAVE_DB_VERSION) /* The version of the dbm library, if using Berkeley DB */ rb_define_const(rb_cDBM, "VERSION", rb_str_new2(db_version(NULL, NULL, NULL))); -#elif defined(HAVE_GDBM_VERSION) +#elif defined(HAVE_DECLARED_LIBVAR_GDBM_VERSION) /* since gdbm 1.9 */ rb_define_const(rb_cDBM, "VERSION", rb_str_new2(gdbm_version)); -#elif defined(HAVE_LIBVAR_GDBM_VERSION) +#elif defined(HAVE_UNDECLARED_LIBVAR_GDBM_VERSION) /* ndbm.h doesn't declare gdbm_version until gdbm 1.8.3. * See extconf.rb for more information. */ { |