diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-10-17 12:02:45 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-10-17 12:02:45 +0200 |
| commit | a5e964190697f7367e92628620baaee370c32f88 (patch) | |
| tree | f0fc96abf5b9052a503d7bfe6af9025941dc8feb /sys/include | |
| parent | e30f50283c60e21763aa28def66deab70ae12187 (diff) | |
change Rune from ushort to uint for to 21 bit runes (thanks mischief!)
big big change. requires rebuilding 8c first and then rebuild
everything.
Diffstat (limited to 'sys/include')
| -rw-r--r-- | sys/include/ape/limits.h | 2 | ||||
| -rw-r--r-- | sys/include/ape/u.h | 4 | ||||
| -rw-r--r-- | sys/include/ape/utf.h | 6 | ||||
| -rw-r--r-- | sys/include/libc.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/include/ape/limits.h b/sys/include/ape/limits.h index 0837bbe1d..8986b7bf4 100644 --- a/sys/include/ape/limits.h +++ b/sys/include/ape/limits.h @@ -3,7 +3,7 @@ /* 8 bit chars (signed), 16 bit shorts, 32 bit ints/longs */ #define CHAR_BIT 8 -#define MB_LEN_MAX 3 +#define MB_LEN_MAX 4 #define UCHAR_MAX 0xff #define USHRT_MAX 0xffff diff --git a/sys/include/ape/u.h b/sys/include/ape/u.h index 87af9d1cd..4ce766194 100644 --- a/sys/include/ape/u.h +++ b/sys/include/ape/u.h @@ -9,10 +9,10 @@ typedef unsigned short ushort; typedef unsigned char uchar; typedef unsigned long ulong; typedef unsigned int uint; -typedef signed char schar; +typedef signed char schar; typedef long long vlong; typedef unsigned long long uvlong; -typedef ushort Rune; +typedef uint Rune; typedef union FPdbleword FPdbleword; typedef char* p9va_list; diff --git a/sys/include/ape/utf.h b/sys/include/ape/utf.h index bba977100..c78b94fee 100644 --- a/sys/include/ape/utf.h +++ b/sys/include/ape/utf.h @@ -7,15 +7,15 @@ extern "C" { #endif -typedef unsigned short Rune; /* 16 bits */ +typedef unsigned int Rune; /* 32 bits */ enum { - UTFmax = 3, /* maximum bytes per rune */ + UTFmax = 4, /* maximum bytes per rune */ Runesync = 0x80, /* cannot represent part of a UTF sequence (<) */ Runeself = 0x80, /* rune and UTF sequences are the same (<) */ Runeerror = 0xFFFD, /* decoding error in UTF */ - Runemax = 0xFFFF, /* 16 bit rune */ + Runemax = 0x10FFFF, /* 21 bit rune */ }; /* diff --git a/sys/include/libc.h b/sys/include/libc.h index a92e5680d..1300d46d5 100644 --- a/sys/include/libc.h +++ b/sys/include/libc.h @@ -41,12 +41,12 @@ extern int tokenize(char*, char**, int); enum { - UTFmax = 3, /* maximum bytes per rune */ + UTFmax = 4, /* maximum bytes per rune */ Runesync = 0x80, /* cannot represent part of a UTF sequence (<) */ Runeself = 0x80, /* rune and UTF sequences are the same (<) */ Runeerror = 0xFFFD, /* decoding error in UTF */ - Runemax = 0xFFFF, /* 16 bit rune */ - Runemask = 0xFFFF, /* bits used by runes (see grep) */ + Runemax = 0x10FFFF, /* 21 bit rune */ + Runemask = 0x1FFFFF, /* bits used by runes (see grep) */ }; /* |