1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/dbm/extconf.rb: use DBM_SUFFIX only to detect header of

Berkeley DB.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-02-23 03:23:40 +00:00
parent 0585853c69
commit fd2e0e3dac
2 changed files with 9 additions and 6 deletions

View file

@ -1,3 +1,8 @@
Thu Feb 23 12:21:48 2012 Tanaka Akira <akr@fsij.org>
* ext/dbm/extconf.rb: use DBM_SUFFIX only to detect header of
Berkeley DB.
Thu Feb 23 10:00:18 2012 Eric Hodel <drbrain@segment7.net> Thu Feb 23 10:00:18 2012 Eric Hodel <drbrain@segment7.net>
* io.c (rb_io_f_sync): Fix double-negative typo. [ruby-trunk - #5837] * io.c (rb_io_f_sync): Fix double-negative typo. [ruby-trunk - #5837]

View file

@ -148,12 +148,10 @@ def headers.db_check2(db, hdr)
return false return false
end end
# Berkeley DB's ndbm.h (since 1.85 at least) includes db.h and # Berkeley DB's ndbm.h (since 1.85 at least) defines DBM_SUFFIX.
# it defines _DB_H_. # Note that _DB_H_ is not defined on Mac OS X because
have_db_header = have_macro('_DB_H_', hdr, hsearch) # it uses Berkeley DB 1 but ndbm.h doesn't include db.h.
have_db_header = have_macro('DBM_SUFFIX', hdr, hsearch)
# Mac OS X uses Berkeley DB 1 but ndbm.h doesn't include db.h.
have_db_header |= have_macro('DBM_SUFFIX', hdr, hsearch)
# Old GDBM's ndbm.h, until 1.8.3, defines dbm_clearerr as a macro which # Old GDBM's ndbm.h, until 1.8.3, defines dbm_clearerr as a macro which
# expands to no tokens. # expands to no tokens.