diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2019-04-20 19:55:08 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2019-04-20 19:55:08 +0000 |
| commit | cf37386b71518d73a56735fc16cd0edf7f916c63 (patch) | |
| tree | b27a4b98cdff1e93d051f3df0f9432d51eea2ee5 /databases/ruby-bdb/files/patch-src-recnum.c | |
| parent | . Update to 8u212. (diff) | |
Fix build problem with ruby 2.5.
This patch should be included upstream.
PR: 237410
Submitted by: ume@
Reported by: mbeis@xs4all.nl
Reviewed by: mbeis@xs4all.nl, w.schwarzenfeld@utanet.at
Notes
Notes:
svn path=/head/; revision=499463
Diffstat (limited to 'databases/ruby-bdb/files/patch-src-recnum.c')
| -rw-r--r-- | databases/ruby-bdb/files/patch-src-recnum.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/ruby-bdb/files/patch-src-recnum.c b/databases/ruby-bdb/files/patch-src-recnum.c index ec7b9548f2c3..968e258d4678 100644 --- a/databases/ruby-bdb/files/patch-src-recnum.c +++ b/databases/ruby-bdb/files/patch-src-recnum.c @@ -1,22 +1,22 @@ ---- src/recnum.c.orig 2011-04-06 19:35:39.000000000 +0000 -+++ src/recnum.c 2015-01-22 17:16:32.000000000 +0000 -@@ -17,7 +17,7 @@ +--- src/recnum.c.orig 2011-04-06 19:35:39 UTC ++++ src/recnum.c +@@ -17,7 +17,7 @@ bdb_recnum_init(int argc, VALUE *argv, V argc++; } rb_hash_aset(argv[argc - 1], array, INT2FIX(0)); - if (rb_hash_aref(argv[argc - 1], sarray) != RHASH(argv[argc - 1])->ifnone) { -+ if (rb_hash_aref(argv[argc - 1], sarray) != rb_hash_ifnone(argv[argc - 1])) { ++ if (rb_hash_lookup(argv[argc - 1], sarray) != Qnil) { rb_hash_aset(argv[argc - 1], sarray, INT2FIX(0)); } rb_hash_aset(argv[argc - 1], rb_str_new2("set_flags"), INT2FIX(DB_RENUMBER)); -@@ -697,8 +697,8 @@ +@@ -697,8 +697,8 @@ bdb_sary_clear(int argc, VALUE *argv, VA if (argc && TYPE(argv[argc - 1]) == T_HASH) { VALUE f = argv[argc - 1]; - if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone || - (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) { -+ if ((g = rb_hash_aref(f, rb_intern("flags"))) != rb_hash_ifnone(f) || -+ (g = rb_hash_aref(f, rb_str_new2("flags"))) != rb_hash_ifnone(f)) { ++ if ((g = rb_hash_lookup(f, rb_intern("flags"))) != Qnil || ++ (g = rb_hash_lookup(f, rb_str_new2("flags"))) != Qnil) { flags = NUM2INT(g); } argc--; |