diff options
| author | Steve Wills <swills@FreeBSD.org> | 2014-01-03 01:59:31 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2014-01-03 01:59:31 +0000 |
| commit | 5072887128b89e0686a04ebab56bb971b848996b (patch) | |
| tree | 90ab2135cbbd38659085a5ccc1337dc7e3c29da3 /databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc | |
| parent | Part 3 at removing now useless FETCH_ARGS redifition (diff) | |
- Minimize patches to just remove the comparison
Pointed out by: mandree
Pointyhat to: swills
Diffstat (limited to '')
| -rw-r--r-- | databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc index 7ec4721e5d6a..bbbcc43a5269 100644 --- a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc +++ b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc @@ -1,19 +1,9 @@ --- ./bdbxml1/bdbxml.cc.orig 2011-04-06 19:35:39.000000000 +0000 -+++ ./bdbxml1/bdbxml.cc 2013-12-18 19:00:54.663254132 +0000 -@@ -2316,7 +2316,7 @@ - - void Init_bdbxml() - { -- int major, minor, patch; -+ int major, minor; - VALUE version; - #ifdef BDB_LINK_OBJ - extern void Init_bdb(); -@@ -2339,19 +2339,16 @@ - xb_mDb = rb_const_get(rb_cObject, rb_intern("BDB")); ++++ ./bdbxml1/bdbxml.cc 2014-01-03 01:47:58.535201285 +0000 +@@ -2340,18 +2340,16 @@ major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR"))); minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR"))); -- patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH"))); + patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH"))); - if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR - || patch != DB_VERSION_PATCH) { - rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d.%d and BDB version %d.%d.%d\n", @@ -24,13 +14,12 @@ + DB_VERSION_MAJOR, DB_VERSION_MINOR, + major, minor); } -- version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch)); + version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch)); - if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR - || patch != DBXML_VERSION_PATCH) { - rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d.%d and libdbxml version %d.%d.%d\n", - DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, - major, minor, patch); -+ version = rb_tainted_str_new2(dbxml_version(&major, &minor)); + if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR) { + rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d and libdbxml version %d.%d\n", + DB_VERSION_MAJOR, DB_VERSION_MINOR, @@ -38,11 +27,3 @@ } xb_eFatal = rb_const_get(xb_mDb, rb_intern("Fatal")); -@@ -2374,7 +2371,6 @@ - rb_define_const(xb_mXML, "VERSION", version); - rb_define_const(xb_mXML, "VERSION_MAJOR", INT2FIX(major)); - rb_define_const(xb_mXML, "VERSION_MINOR", INT2FIX(minor)); -- rb_define_const(xb_mXML, "VERSION_PATCH", INT2FIX(patch)); - #ifdef DBXML_CHKSUM_SHA1 - rb_define_const(xb_mXML, "CHKSUM_SHA1", INT2NUM(DBXML_CHKSUM_SHA1)); - #endif |