Add path to all includes.

diff --git a/charset/charconv.c b/charset/charconv.c
index 8da42ffec31ab13e81fca811fcb55b473ba894e4..7ef6c8947351db428f9b988f4857463fa6e5825c 100644 (file)
--- a/charset/charconv.c
+++ b/charset/charconv.c
@@ -7,8 +7,8 @@
  *     of the GNU General Public License.
  */
 
-#include "charconv.h"
-#include "chartable.h"
+#include "charset/charconv.h"
+#include "charset/chartable.h"
 
 #ifndef NULL
 #define NULL ((void *)0)

diff --git a/charset/debug.c b/charset/debug.c
index 7874856e176ea8230aaa133b44d70b37ee247ecd..f67ea8c79a5fc9d8543fbaaf375b6088c716bdad 100644 (file)
--- a/charset/debug.c
+++ b/charset/debug.c
@@ -5,9 +5,9 @@
  */
 
 #include <stdio.h>
-#include <lib/lib.h>
 
-#include "unicode.h"
+#include "lib/lib.h"
+#include "charset/unicode.h"
 
 static byte *
 get_static_buffer(uns size)

diff --git a/charset/setnames.c b/charset/setnames.c
index 2a36cde77d1d96df52244fba935d6d472776d1c5..67e0de75a6474d02d584b040620eb0e7d3960c98 100644 (file)
--- a/charset/setnames.c
+++ b/charset/setnames.c
@@ -9,8 +9,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <lib/lib.h>
 
+#include "lib/lib.h"
 #include "charconv.h"
 
 char *cs_names[] = {

diff --git a/charset/strlen.c b/charset/strlen.c
index 723b6624ec7f7886c83fab1a65da708cca525386..b1f282b15d12f0b5275b778bd7ffe861405a3b8e 100644 (file)
--- a/charset/strlen.c
+++ b/charset/strlen.c
@@ -4,7 +4,7 @@
  *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "unicode.h"
+#include "charset/unicode.h"
 
 uns
 Ustrlen(word *w)

diff --git a/charset/test.c b/charset/test.c
index a39779a97f30ad006f3411ce6f184369b6e62f4c..b5fcb58b08e20ea79193dd7ae64c196510c51d87 100644 (file)
--- a/charset/test.c
+++ b/charset/test.c
@@ -2,8 +2,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <lib/lib.h>
-#include <charset/unicode.h>
+#include "lib/lib.h"
+#include "charset/unicode.h"
 
 int main(void)
 {

diff --git a/charset/tocat.c b/charset/tocat.c
index 243e2fa1165080550e27df280aa9300cb56edb84..c12c6226fd89d06b0867c74c2c8cff0461ce0329 100644 (file)
--- a/charset/tocat.c
+++ b/charset/tocat.c
@@ -4,6 +4,5 @@
  *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "unicode.h"
-
-#include "U-cat.h"
+#include "charset/unicode.h"
+#include "charset/U-cat.h"

diff --git a/charset/tolower.c b/charset/tolower.c
index 75bcc9dd611e61d856cfa3435cd509726885af0c..84271e5f41f0def9761325b2420e2333c46cd259 100644 (file)
--- a/charset/tolower.c
+++ b/charset/tolower.c
@@ -4,6 +4,5 @@
  *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "unicode.h"
-
-#include "U-lower.h"
+#include "charset/unicode.h"
+#include "charset/U-lower.h"

diff --git a/charset/tosig.c b/charset/tosig.c
index 53f4bd220ed20b772db4986b8ac567551d3e9ae3..0395eb97894d2a2a1df662b8318cced301b62054 100644 (file)
--- a/charset/tosig.c
+++ b/charset/tosig.c
@@ -4,6 +4,5 @@
  *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "unicode.h"
-
-#include "U-sig.h"
+#include "charset/unicode.h"
+#include "charset/U-sig.h"

diff --git a/charset/toupper.c b/charset/toupper.c
index f37eb604832d34cdbc64690f2c9016f6aa1beccc..43210349cd8051ffc7cb5f812674c33147912ad2 100644 (file)
--- a/charset/toupper.c
+++ b/charset/toupper.c
@@ -4,6 +4,5 @@
  *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "unicode.h"
-
-#include "U-upper.h"
+#include "charset/unicode.h"
+#include "charset/U-upper.h"

diff --git a/charset/unaccent.c b/charset/unaccent.c
index 9345201a13afe571d0a6bc335174ef4c7f9dc1b5..3ccdbe7fa2a0556e4a7fe7fd303928c42d1e6521 100644 (file)
--- a/charset/unaccent.c
+++ b/charset/unaccent.c
@@ -4,6 +4,5 @@
  *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "unicode.h"
-
-#include "U-unacc.h"
+#include "charset/unicode.h"
+#include "charset/U-unacc.h"

diff --git a/charset/unicode.h b/charset/unicode.h
index a01eb97c23d22b004cca1a60a9b17b7c103c480e..36336c8e3e2585b5d58c138f769d017fe2dd367c 100644 (file)
--- a/charset/unicode.h
+++ b/charset/unicode.h
@@ -8,24 +8,11 @@
 #define _UNICODE_H
 
 #include "lib/config.h"
+#include "lib/chartype.h"
 
 extern byte *_U_cat[], *_U_sig[];
 extern word *_U_upper[], *_U_lower[], *_U_unaccent[];
 
-#define _C_UPPER 1                     /* Upper-case letters */
-#define _C_LOWER 2                     /* Lower-case letters */
-#define _C_PRINT 4                     /* Printable */
-#define _C_DIGIT 8                     /* Digits */
-#define _C_CTRL 16                     /* Control characters */
-#define _C_XDIGIT 32                   /* Hexadecimal digits */
-#define _C_BLANK 64                    /* Blanks */
-#define _C_INNER 128                   /* `inner punctuation' -- underscore etc. */
-
-#define _C_ALPHA (_C_UPPER | _C_LOWER)
-#define _C_ALNUM (_C_ALPHA | _C_DIGIT)
-#define _C_WORD (_C_ALNUM | _C_INNER)
-#define _C_WSTART (_C_ALPHA | _C_INNER)
-
 static inline uns Ucategory(word x)
 {
   if (_U_cat[x >> 8U])

diff --git a/charset/utf8.c b/charset/utf8.c
index 915addeeac88fc18d73938d2bea52fce8695eb58..1258f73615dddb3d24e33a9ae17d4989d16bf952 100644 (file)
--- a/charset/utf8.c
+++ b/charset/utf8.c
@@ -4,7 +4,7 @@
  *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "unicode.h"
+#include "charset/unicode.h"
 
 uns
 ucs2_to_utf8(byte *d, word *s)