summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/lang/texlang.c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-01-27 08:50:35 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-01-27 08:50:35 +0000
commitaf35f0e080afc5bac3c27332e982c87792baf38f (patch)
treefa2ab41429c327d1645c79ff79b134b94394e548 /Build/source/texk/web2c/luatexdir/lang/texlang.c
parent00434bca559ac03180c0a6c8cff2888d279a69d2 (diff)
texk/web2c/luatexdir: externs and more compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@16842 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/lang/texlang.c')
-rw-r--r--Build/source/texk/web2c/luatexdir/lang/texlang.c26
1 files changed, 7 insertions, 19 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lang/texlang.c b/Build/source/texk/web2c/luatexdir/lang/texlang.c
index c315e4e05d8..5a17b2c34b6 100644
--- a/Build/source/texk/web2c/luatexdir/lang/texlang.c
+++ b/Build/source/texk/web2c/luatexdir/lang/texlang.c
@@ -29,23 +29,13 @@
static const char _svn_version[] =
"$Id: texlang.c 2596 2009-06-25 09:26:59Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/src/texk/web2c/luatexdir/lang/texlang.c $";
-/* functions from the fontforge unicode library */
+/* functions copied from the fontforge unicode library */
-#if 0
-extern unsigned int *utf82u_strcpy(unsigned int *ubuf, const char *utf8buf);
-extern unsigned int u_strlen(unsigned int *ubuf);
-extern char *utf8_idpb(char *w, unsigned int i);
-#else
-
-typedef unsigned int unichar_t;
-typedef unsigned char uint8;
-typedef unsigned int uint32;
-
-static unichar_t *utf82u_strcpy(unichar_t * ubuf, const char *utf8buf)
+static unsigned int *utf82u_strcpy(unsigned int * ubuf, const char *utf8buf)
{
int len = strlen(utf8buf) + 1;
- unichar_t *upt = ubuf, *uend = ubuf + len - 1;
- const uint8 *pt = (const uint8 *) utf8buf, *end = pt + strlen(utf8buf);
+ unsigned int *upt = ubuf, *uend = ubuf + len - 1;
+ const unsigned char *pt = (const unsigned char *) utf8buf, *end = pt + strlen(utf8buf);
int w, w2;
while (pt < end && *pt != '\0' && upt < uend) {
@@ -70,7 +60,7 @@ static unichar_t *utf82u_strcpy(unichar_t * ubuf, const char *utf8buf)
return (ubuf);
}
-static char *utf8_idpb(char *utf8_text, uint32 ch)
+char *utf8_idpb(char *utf8_text, unsigned int ch)
{
/* Increment and deposit character */
if (ch >= 17 * 65536)
@@ -86,7 +76,7 @@ static char *utf8_idpb(char *utf8_text, uint32 ch)
*utf8_text++ = 0x80 | ((ch >> 6) & 0x3f);
*utf8_text++ = 0x80 | (ch & 0x3f);
} else {
- uint32 val = ch - 0x10000;
+ unsigned int val = ch - 0x10000;
int u = ((val & 0xf0000) >> 16) + 1, z = (val & 0x0f000) >> 12, y =
(val & 0x00fc0) >> 6, x = val & 0x0003f;
*utf8_text++ = 0xf0 | (u >> 2);
@@ -97,7 +87,7 @@ static char *utf8_idpb(char *utf8_text, uint32 ch)
return (utf8_text);
}
-static int u_strlen(register unichar_t * str)
+static int u_strlen(register unsigned int * str)
{
register int len = 0;
while (*str++ != '\0')
@@ -105,8 +95,6 @@ static int u_strlen(register unichar_t * str)
return (len);
}
-#endif
-
#define noVERBOSE
#define MAX_TEX_LANGUAGES 32768