From 0860307de69e9a3fe012afb5311465a5ff1f1186 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Tue, 5 Dec 2000 23:00:55 +0000 Subject: [PATCH] Add path to all includes. --- charset/charconv.c | 4 ++-- charset/debug.c | 4 ++-- charset/setnames.c | 2 +- charset/strlen.c | 2 +- charset/test.c | 4 ++-- charset/tocat.c | 5 ++--- charset/tolower.c | 5 ++--- charset/tosig.c | 5 ++--- charset/toupper.c | 5 ++--- charset/unaccent.c | 5 ++--- charset/unicode.h | 15 +-------------- charset/utf8.c | 2 +- 12 files changed, 20 insertions(+), 38 deletions(-) diff --git a/charset/charconv.c b/charset/charconv.c index 8da42ffe..7ef6c894 100644 --- 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 7874856e..f67ea8c7 100644 --- a/charset/debug.c +++ b/charset/debug.c @@ -5,9 +5,9 @@ */ #include -#include -#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 2a36cde7..67e0de75 100644 --- a/charset/setnames.c +++ b/charset/setnames.c @@ -9,8 +9,8 @@ #include #include -#include +#include "lib/lib.h" #include "charconv.h" char *cs_names[] = { diff --git a/charset/strlen.c b/charset/strlen.c index 723b6624..b1f282b1 100644 --- a/charset/strlen.c +++ b/charset/strlen.c @@ -4,7 +4,7 @@ * (c) 1997 Martin Mares, */ -#include "unicode.h" +#include "charset/unicode.h" uns Ustrlen(word *w) diff --git a/charset/test.c b/charset/test.c index a39779a9..b5fcb58b 100644 --- a/charset/test.c +++ b/charset/test.c @@ -2,8 +2,8 @@ #include #include -#include -#include +#include "lib/lib.h" +#include "charset/unicode.h" int main(void) { diff --git a/charset/tocat.c b/charset/tocat.c index 243e2fa1..c12c6226 100644 --- a/charset/tocat.c +++ b/charset/tocat.c @@ -4,6 +4,5 @@ * (c) 1997 Martin Mares, */ -#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 75bcc9dd..84271e5f 100644 --- a/charset/tolower.c +++ b/charset/tolower.c @@ -4,6 +4,5 @@ * (c) 1997 Martin Mares, */ -#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 53f4bd22..0395eb97 100644 --- a/charset/tosig.c +++ b/charset/tosig.c @@ -4,6 +4,5 @@ * (c) 1997 Martin Mares, */ -#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 f37eb604..43210349 100644 --- a/charset/toupper.c +++ b/charset/toupper.c @@ -4,6 +4,5 @@ * (c) 1997 Martin Mares, */ -#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 9345201a..3ccdbe7f 100644 --- a/charset/unaccent.c +++ b/charset/unaccent.c @@ -4,6 +4,5 @@ * (c) 1997 Martin Mares, */ -#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 a01eb97c..36336c8e 100644 --- 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 915addee..1258f736 100644 --- a/charset/utf8.c +++ b/charset/utf8.c @@ -4,7 +4,7 @@ * (c) 1997 Martin Mares, */ -#include "unicode.h" +#include "charset/unicode.h" uns ucs2_to_utf8(byte *d, word *s) -- 2.39.2