| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From aacd2398e766500cb5d83c4d76b642fcf31d997a Mon Sep 17 00:00:00 2001 |
| 2 | From: Sergey Poznyakoff <gray@gnu.org> |
| 3 | Date: Wed, 23 Jun 2021 10:26:50 +0300 |
| 4 | Subject: [PATCH] Fix GDBM_File to compile with version 1.20 and earlier |
| 5 | |
| 6 | * ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally, |
| 7 | depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR. |
| 8 | Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since |
| 9 | gdbm commit d3e27957). |
| 10 | |
| 11 | Upstream-Status: Backport |
| 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 13 | --- |
| 14 | ext/GDBM_File/GDBM_File.xs | 11 +++++------ |
| 15 | 1 file changed, 5 insertions(+), 6 deletions(-) |
| 16 | |
| 17 | diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs |
| 18 | index cd0bb6f26ffa..494c2889ca89 100644 |
| 19 | --- a/ext/GDBM_File/GDBM_File.xs |
| 20 | +++ b/ext/GDBM_File/GDBM_File.xs |
| 21 | @@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size) |
| 22 | #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt") |
| 23 | #endif |
| 24 | |
| 25 | -#ifndef GDBM_ITEM_NOT_FOUND |
| 26 | -# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR |
| 27 | -#endif |
| 28 | - |
| 29 | +#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 |
| 30 | /* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR |
| 31 | if the requested key did not exist */ |
| 32 | -#define ITEM_NOT_FOUND() \ |
| 33 | - (gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR) |
| 34 | +# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR) |
| 35 | +#else |
| 36 | +# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND) |
| 37 | +#endif |
| 38 | |
| 39 | #define CHECKDB(db) do { \ |
| 40 | if (!db->dbp) { \ |