| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 5bc1e5fdd87aa205011512cd1e6cc655bcf677fd Mon Sep 17 00:00:00 2001 |
| 2 | From: Sergey Poznyakoff <gray@gnu.org> |
| 3 | Date: Wed, 23 Jun 2021 15:31:42 +0300 |
| 4 | Subject: [PATCH] Fix definition of ITEM_NOT_FOUND for pre-1.13 versions. |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 8 | --- |
| 9 | ext/GDBM_File/GDBM_File.xs | 9 +++++---- |
| 10 | 1 file changed, 5 insertions(+), 4 deletions(-) |
| 11 | |
| 12 | diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs |
| 13 | index 494c2889ca89..0125b5dcac4d 100644 |
| 14 | --- a/ext/GDBM_File/GDBM_File.xs |
| 15 | +++ b/ext/GDBM_File/GDBM_File.xs |
| 16 | @@ -145,10 +145,11 @@ output_datum(pTHX_ SV *arg, char *str, int size) |
| 17 | #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt") |
| 18 | #endif |
| 19 | |
| 20 | -#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 |
| 21 | -/* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR |
| 22 | - if the requested key did not exist */ |
| 23 | -# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR) |
| 24 | +#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 |
| 25 | +/* Prior to 1.13, only gdbm_fetch set GDBM_ITEM_NOT_FOUND if the requested |
| 26 | + key did not exist. Other similar function wouls set GDBM_NO_ERROR instead. |
| 27 | + The GDBM_ITEM_NOT_FOUND existeds as early as in 1.7.3 */ |
| 28 | +# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND) |
| 29 | #else |
| 30 | # define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND) |
| 31 | #endif |