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-cursor.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-cursor.c')
-rw-r--r-- | databases/ruby-bdb/files/patch-src-cursor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/databases/ruby-bdb/files/patch-src-cursor.c b/databases/ruby-bdb/files/patch-src-cursor.c index 52253da25726..4625171352de 100644 --- a/databases/ruby-bdb/files/patch-src-cursor.c +++ b/databases/ruby-bdb/files/patch-src-cursor.c @@ -1,13 +1,13 @@ ---- src/cursor.c.orig 2015-01-22 17:37:51.000000000 +0000 -+++ src/cursor.c 2015-01-22 17:38:17.000000000 +0000 -@@ -29,8 +29,8 @@ +--- src/cursor.c.orig 2011-04-06 19:35:39 UTC ++++ src/cursor.c +@@ -29,8 +29,8 @@ bdb_cursor(int argc, VALUE *argv, VALUE flags = 0; if (argc && TYPE(argv[argc - 1]) == T_HASH) { VALUE g, 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--; |