You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.5 KiB
50 lines
1.5 KiB
From c211f9b17af410463ce9cfc9b1b100228b51720f Mon Sep 17 00:00:00 2001
|
|
From: Lars Wendler <polynomial-c@gentoo.org>
|
|
Date: Sat, 31 Oct 2020 10:44:36 +0100
|
|
Subject: [PATCH] Fix build with icu-68.1
|
|
|
|
icu-68.1 removed public macro definitions for TRUE and FALSE
|
|
|
|
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
---
|
|
src/calibre/utils/icu.c | 4 ++--
|
|
src/calibre/utils/matcher.c | 1 -
|
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/calibre/utils/icu.c b/src/calibre/utils/icu.c
|
|
index 62d05de310..4e918492d9 100644
|
|
--- a/src/calibre/utils/icu.c
|
|
+++ b/src/calibre/utils/icu.c
|
|
@@ -238,14 +238,14 @@ icu_Collator_contains(icu_Collator *self, PyObject *args) {
|
|
|
|
a = python_to_icu(a_, &asz);
|
|
if (a == NULL) goto end;
|
|
- if (asz == 0) { found = TRUE; goto end; }
|
|
+ if (asz == 0) { found = 1; goto end; }
|
|
b = python_to_icu(b_, &bsz);
|
|
if (b == NULL) goto end;
|
|
|
|
search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
|
|
if (U_SUCCESS(status)) {
|
|
pos = usearch_first(search, &status);
|
|
- if (pos != USEARCH_DONE) found = TRUE;
|
|
+ if (pos != USEARCH_DONE) found = 1;
|
|
}
|
|
end:
|
|
if (search != NULL) usearch_close(search);
|
|
diff --git a/src/calibre/utils/matcher.c b/src/calibre/utils/matcher.c
|
|
index f38a7082ce..8e57947867 100644
|
|
--- a/src/calibre/utils/matcher.c
|
|
+++ b/src/calibre/utils/matcher.c
|
|
@@ -15,7 +15,6 @@
|
|
#define inline
|
|
#endif
|
|
|
|
-typedef unsigned char bool;
|
|
#define TRUE 1
|
|
#define FALSE 0
|
|
#define MAX(x, y) ((x > y) ? x : y)
|
|
--
|
|
2.29.2
|
|
|