icu.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132
  1. diff -Naur calibre-3.48.0.orig/src/calibre/utils/icu.c calibre-3.48.0/src/calibre/utils/icu.c
  2. --- calibre-3.48.0.orig/src/calibre/utils/icu.c 2019-09-13 04:46:46.000000000 +0200
  3. +++ calibre-3.48.0/src/calibre/utils/icu.c 2020-12-05 09:20:59.063932000 +0100
  4. @@ -243,14 +243,14 @@
  5. a = python_to_icu(a_, &asz);
  6. if (a == NULL) goto end;
  7. - if (asz == 0) { found = TRUE; goto end; }
  8. + if (asz == 0) { found = true; goto end; }
  9. b = python_to_icu(b_, &bsz);
  10. if (b == NULL) goto end;
  11. search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
  12. if (U_SUCCESS(status)) {
  13. pos = usearch_first(search, &status);
  14. - if (pos != USEARCH_DONE) found = TRUE;
  15. + if (pos != USEARCH_DONE) found = true;
  16. }
  17. end:
  18. if (search != NULL) usearch_close(search);
  19. diff -Naur calibre-3.48.0.orig/src/calibre/utils/matcher.c calibre-3.48.0/src/calibre/utils/matcher.c
  20. --- calibre-3.48.0.orig/src/calibre/utils/matcher.c 2019-09-13 04:46:46.000000000 +0200
  21. +++ calibre-3.48.0/src/calibre/utils/matcher.c 2020-12-05 09:26:57.800932000 +0100
  22. @@ -15,7 +15,6 @@
  23. #define inline
  24. #endif
  25. -typedef unsigned char bool;
  26. #define TRUE 1
  27. #define FALSE 0
  28. #define MAX(x, y) ((x > y) ? x : y)