From 30f292d496c1e4aa9aa1b78dc5b9beaf998f3ca1 Mon Sep 17 00:00:00 2001 From: Jan Biedermann Date: Mon, 14 Nov 2022 18:03:20 +0300 Subject: [PATCH] mdbx: fix typo of `||` inside `#if` byte-order condition (backport). https://gitflic.ru/project/erthink/libmdbx/merge-request/4 --- ChangeLog.md | 9 ++++++++- src/base.h | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 031b12f5..24fe67e5 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,7 +1,14 @@ ChangeLog --------- -## v0.11.13 at (Swashplate) 2022-11-10 +## Release engineering of v0.11.14 + +Fixes: + + - Fixed insignificant typo of `||` inside `#if` byte-order condition (backport). + + +## v0.11.13 (Swashplate) at 2022-11-10 The stable bugfix release in memory of [Boris Yuryev](https://ru.wikipedia.org/wiki/Юрьев,_Борис_Николаевич) on his 133rd birthday. diff --git a/src/base.h b/src/base.h index 57c0d311..90ae707b 100644 --- a/src/base.h +++ b/src/base.h @@ -291,8 +291,8 @@ __extern_C key_t ftok(const char *, int); /* Byteorder */ #if defined(i386) || defined(__386) || defined(__i386) || defined(__i386__) || \ - defined(i486) || defined(__i486) || defined(__i486__) || \ - defined(i586) | defined(__i586) || defined(__i586__) || defined(i686) || \ + defined(i486) || defined(__i486) || defined(__i486__) || defined(i586) || \ + defined(__i586) || defined(__i586__) || defined(i686) || \ defined(__i686) || defined(__i686__) || defined(_M_IX86) || \ defined(_X86_) || defined(__THW_INTEL__) || defined(__I86__) || \ defined(__INTEL__) || defined(__x86_64) || defined(__x86_64__) || \