As usually, stuff in lib/* is LGPL'ed.

[libucw.git] / lib / index.h

diff --git a/lib/index.h b/lib/index.h
index 6579fc4d09aec556531726687a2ef1a3715272f0..8bfbe88d4d6862f58118de370d52f41d3d483553 100644 (file)
--- a/lib/index.h
+++ b/lib/index.h
@@ -28,7 +28,9 @@ struct index_params {
 
 struct card_attr {
   u32 card;                            /* Reference to card description (either oid or filepos) */
 
 struct card_attr {
   u32 card;                            /* Reference to card description (either oid or filepos) */

+#ifdef CONFIG_SITES

   u32 site_id;
   u32 site_id;

+#endif

   CUSTOM_CARD_ATTRS                    /* Include all custom attributes */
   byte weight;
   byte flags;
   CUSTOM_CARD_ATTRS                    /* Include all custom attributes */
   byte weight;
   byte flags;


@@ -86,6 +88,17 @@ fp_hash(struct fingerprint *fp)
     p++;                                                       \
 } while (0)
 
     p++;                                                       \
 } while (0)
 

+#define SKIP_TAGGED_CHAR(p) do {                               \
+  if (*p >= 0x80 && *p < 0xc0)                                 \
+    {                                                          \
+      uns u = *p++;                                            \
+      if (u >= 0xa0 && u < 0xb0 && *p >= 0x80 && *p < 0xc0)    \
+       p++;                                                    \
+    }                                                          \
+  else                                                         \
+    UTF8_SKIP(p);                                              \
+} while (0)
+

 static inline uns
 bget_tagged_char(struct fastbuf *f)
 {
 static inline uns
 bget_tagged_char(struct fastbuf *f)
 {