cyrus-imapd-icu.patch

   1 --- cyrus-imapd-3.0.9/lib/charset.h.orig        2019-03-15 01:31:20.000000000 +0100
   2 +++ cyrus-imapd-3.0.9/lib/charset.h     2019-04-16 18:25:58.340151121 +0200
   3 @@ -60,6 +60,10 @@
   4
   5  #include "unicode/ucnv.h"
   6
   7 +#ifdef __cplusplus
   8 +extern "C" {
   9 +#endif
  10 +
  11  #include "util.h"
  12
  13  typedef int comp_pat;
  14 @@ -127,4 +131,8 @@
  15                             charset_t charset, int encoding,
  16                             const char *subtype, int flags);
  17
  18 +#ifdef __cplusplus
  19 +}
  20 +#endif
  21 +
  22  #endif /* INCLUDED_CHARSET_H */
  23 --- cyrus-imapd-3.0.9/imap/xapian_wrap.cpp.orig 2019-03-15 01:31:20.000000000 +0100
  24 +++ cyrus-imapd-3.0.9/imap/xapian_wrap.cpp      2019-04-16 18:30:21.718724277 +0200
  25 @@ -14,13 +14,13 @@
  26  #include "search_part.h"
  27  #include "xmalloc.h"
  28  #include "xapian_wrap.h"
  29 -#include "charset.h"
  30  #include "ptrarray.h"
  31
  32
  33  /* generated headers are not necessarily in current directory */
  34  #include "imap/imap_err.h"
  35  };
  36 +#include "charset.h"
  37
  38  #include <xapian.h>
  39