91 lines
3.4 KiB
Diff
91 lines
3.4 KiB
Diff
From aacd2398e766500cb5d83c4d76b642fcf31d997a Mon Sep 17 00:00:00 2001
|
|
From: Sergey Poznyakoff <gray@gnu.org>
|
|
Date: Wed, 23 Jun 2021 10:26:50 +0300
|
|
Subject: [PATCH 1/3] Fix GDBM_File to compile with version 1.20 and earlier
|
|
|
|
* ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally,
|
|
depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR.
|
|
Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since
|
|
gdbm commit d3e27957).
|
|
---
|
|
ext/GDBM_File/GDBM_File.xs | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
|
|
index cd0bb6f26ffa..494c2889ca89 100644
|
|
--- a/ext/GDBM_File/GDBM_File.xs
|
|
+++ b/ext/GDBM_File/GDBM_File.xs
|
|
@@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size)
|
|
#define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt")
|
|
#endif
|
|
|
|
-#ifndef GDBM_ITEM_NOT_FOUND
|
|
-# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR
|
|
-#endif
|
|
-
|
|
+#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
|
|
/* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR
|
|
if the requested key did not exist */
|
|
-#define ITEM_NOT_FOUND() \
|
|
- (gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR)
|
|
+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR)
|
|
+#else
|
|
+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND)
|
|
+#endif
|
|
|
|
#define CHECKDB(db) do { \
|
|
if (!db->dbp) { \
|
|
|
|
From ea57297a58b8f10ab885c19eec48ea076116cc1f Mon Sep 17 00:00:00 2001
|
|
From: Sergey Poznyakoff <gray@gnu.org>
|
|
Date: Wed, 23 Jun 2021 14:24:47 +0300
|
|
Subject: [PATCH 2/3] Raise version number in ext/GDBM_File/GDBM_File.pm
|
|
|
|
---
|
|
ext/GDBM_File/GDBM_File.pm | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/ext/GDBM_File/GDBM_File.pm b/ext/GDBM_File/GDBM_File.pm
|
|
index d837536f804c..cb08d091b829 100644
|
|
--- a/ext/GDBM_File/GDBM_File.pm
|
|
+++ b/ext/GDBM_File/GDBM_File.pm
|
|
@@ -363,7 +363,7 @@ require XSLoader;
|
|
);
|
|
|
|
# This module isn't dual life, so no need for dev version numbers.
|
|
-$VERSION = '1.19';
|
|
+$VERSION = '1.20';
|
|
|
|
XSLoader::load();
|
|
|
|
|
|
From 5bc1e5fdd87aa205011512cd1e6cc655bcf677fd Mon Sep 17 00:00:00 2001
|
|
From: Sergey Poznyakoff <gray@gnu.org>
|
|
Date: Wed, 23 Jun 2021 15:31:42 +0300
|
|
Subject: [PATCH 3/3] Fix definition of ITEM_NOT_FOUND for pre-1.13 versions.
|
|
|
|
---
|
|
ext/GDBM_File/GDBM_File.xs | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
|
|
index 494c2889ca89..0125b5dcac4d 100644
|
|
--- a/ext/GDBM_File/GDBM_File.xs
|
|
+++ b/ext/GDBM_File/GDBM_File.xs
|
|
@@ -145,10 +145,11 @@ output_datum(pTHX_ SV *arg, char *str, int size)
|
|
#define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt")
|
|
#endif
|
|
|
|
-#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
|
|
-/* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR
|
|
- if the requested key did not exist */
|
|
-# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR)
|
|
+#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
|
|
+/* Prior to 1.13, only gdbm_fetch set GDBM_ITEM_NOT_FOUND if the requested
|
|
+ key did not exist. Other similar function wouls set GDBM_NO_ERROR instead.
|
|
+ The GDBM_ITEM_NOT_FOUND existeds as early as in 1.7.3 */
|
|
+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND)
|
|
#else
|
|
# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND)
|
|
#endif
|