diff options
Diffstat (limited to 'src/lib9/utf')
| -rw-r--r-- | src/lib9/utf/Makefile | 4 | ||||
| -rw-r--r-- | src/lib9/utf/runetype.c | 2 | ||||
| -rw-r--r-- | src/lib9/utf/runetypebody-6.3.0.h (renamed from src/lib9/utf/runetypebody-6.2.0.h) | 3 | ||||
| -rw-r--r-- | src/lib9/utf/utfdef.h | 1 | ||||
| -rw-r--r-- | src/lib9/utf/utfecpy.c | 4 | ||||
| -rw-r--r-- | src/lib9/utf/utflen.c | 1 | ||||
| -rw-r--r-- | src/lib9/utf/utfrrune.c | 4 | ||||
| -rw-r--r-- | src/lib9/utf/utfrune.c | 4 | ||||
| -rw-r--r-- | src/lib9/utf/utfutf.c | 3 |
9 files changed, 12 insertions, 14 deletions
diff --git a/src/lib9/utf/Makefile b/src/lib9/utf/Makefile index 5c9cdf051..fe6f6351a 100644 --- a/src/lib9/utf/Makefile +++ b/src/lib9/utf/Makefile @@ -21,10 +21,10 @@ runetypebody-%.h: mkrunetype UnicodeData-%.txt CLEANFILES+=UnicodeData.txt -UNICODE_VERSION=6.2.0 +UNICODE_VERSION=6.3.0 test: mkrunetype UnicodeData-$(UNICODE_VERSION).txt mkrunetype -c UnicodeData-$(UNICODE_VERSION).txt clean: - rm -f UnicodeData.txt mkrunetype
\ No newline at end of file + rm -f UnicodeData.txt mkrunetype diff --git a/src/lib9/utf/runetype.c b/src/lib9/utf/runetype.c index b3634965f..ed775af08 100644 --- a/src/lib9/utf/runetype.c +++ b/src/lib9/utf/runetype.c @@ -35,4 +35,4 @@ rbsearch(Rune c, Rune *t, int n, int ne) return 0; } -#include "runetypebody-6.2.0.h" +#include "runetypebody-6.3.0.h" diff --git a/src/lib9/utf/runetypebody-6.2.0.h b/src/lib9/utf/runetypebody-6.3.0.h index a603af0df..5554dca36 100644 --- a/src/lib9/utf/runetypebody-6.2.0.h +++ b/src/lib9/utf/runetypebody-6.3.0.h @@ -1,4 +1,4 @@ -/* generated automatically by mkrunetype.c from UnicodeData-6.2.0.txt */ +/* generated automatically by mkrunetype.c from UnicodeData-6.3.0.txt */ static Rune __isspacer[] = { 0x0009, 0x000d, @@ -6,7 +6,6 @@ static Rune __isspacer[] = { 0x0085, 0x0085, 0x00a0, 0x00a0, 0x1680, 0x1680, - 0x180e, 0x180e, 0x2000, 0x200a, 0x2028, 0x2029, 0x202f, 0x202f, diff --git a/src/lib9/utf/utfdef.h b/src/lib9/utf/utfdef.h index adc6d95fb..4bbdfc643 100644 --- a/src/lib9/utf/utfdef.h +++ b/src/lib9/utf/utfdef.h @@ -25,4 +25,3 @@ typedef unsigned int uint; typedef unsigned long ulong; #define nelem(x) (sizeof(x)/sizeof((x)[0])) -#define nil ((void*)0) diff --git a/src/lib9/utf/utfecpy.c b/src/lib9/utf/utfecpy.c index 2eca85ef6..854066460 100644 --- a/src/lib9/utf/utfecpy.c +++ b/src/lib9/utf/utfecpy.c @@ -11,8 +11,8 @@ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. */ -#define _BSD_SOURCE 1 -#include <string.h> +#include <u.h> +#include <libc.h> #include "utf.h" #include "utfdef.h" diff --git a/src/lib9/utf/utflen.c b/src/lib9/utf/utflen.c index 42fcb33ab..9b961856a 100644 --- a/src/lib9/utf/utflen.c +++ b/src/lib9/utf/utflen.c @@ -32,5 +32,4 @@ utflen(const char *s) s += chartorune(&rune, s); n++; } - return 0; } diff --git a/src/lib9/utf/utfrrune.c b/src/lib9/utf/utfrrune.c index 9e28af82a..b1ea93b42 100644 --- a/src/lib9/utf/utfrrune.c +++ b/src/lib9/utf/utfrrune.c @@ -11,7 +11,8 @@ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. */ -#include <string.h> +#include <u.h> +#include <libc.h> #include "utf.h" #include "utfdef.h" @@ -42,5 +43,4 @@ utfrrune(const char *s, Rune c) s1 = s; s += c1; } - return 0; } diff --git a/src/lib9/utf/utfrune.c b/src/lib9/utf/utfrune.c index 0136b2821..44675c989 100644 --- a/src/lib9/utf/utfrune.c +++ b/src/lib9/utf/utfrune.c @@ -11,7 +11,8 @@ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. */ -#include <string.h> +#include <u.h> +#include <libc.h> #include "utf.h" #include "utfdef.h" @@ -41,5 +42,4 @@ utfrune(const char *s, Rune c) return (char*)s; s += n; } - return 0; } diff --git a/src/lib9/utf/utfutf.c b/src/lib9/utf/utfutf.c index e46ddd923..05335b23e 100644 --- a/src/lib9/utf/utfutf.c +++ b/src/lib9/utf/utfutf.c @@ -11,7 +11,8 @@ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. */ -#include <string.h> +#include <u.h> +#include <libc.h> #include "utf.h" #include "utfdef.h" |