diff --git a/src/include/string.h b/src/include/string.h index 2d246a0..8948762 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -27,6 +27,7 @@ #include #include #include +#include #ifndef _SIZE_T_DECLARED typedef __size_t size_t; diff --git a/src/include/sys/types.h b/src/include/sys/types.h index f28790b..08f9591 100644 --- a/src/include/sys/types.h +++ b/src/include/sys/types.h @@ -63,6 +63,9 @@ /**** END ****/ +typedef unsigned char u_char; +typedef unsigned int u_int; + typedef unsigned short uShort; typedef unsigned long uLong; typedef unsigned char uChar; diff --git a/src/lib/libc_old/locale/collate.h b/src/lib/libc_old/locale/collate.h new file mode 100644 index 0000000..334d6ee --- /dev/null +++ b/src/lib/libc_old/locale/collate.h @@ -0,0 +1,67 @@ +/*- + * Copyright (c) 1995 Alex Tatmanjants + * at Electronni Visti IA, Kiev, Ukraine. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/lib/libc/locale/collate.h,v 1.14 2002/08/30 20:26:02 ache Exp $ + */ + +#ifndef _COLLATE_H_ +#define _COLLATE_H_ + +#include +#include +#include + +#define STR_LEN 10 +#define TABLE_SIZE 100 +#define COLLATE_VERSION "1.0\n" +#define COLLATE_VERSION1_1 "1.1\n" + +struct __collate_st_char_pri { + int prim, sec; +}; +struct __collate_st_chain_pri { + u_char str[STR_LEN]; + int prim, sec; +}; + +extern int __collate_load_error; +extern int __collate_substitute_nontrivial; +#define __collate_substitute_table (*__collate_substitute_table_ptr) +extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; +#define __collate_char_pri_table (*__collate_char_pri_table_ptr) +extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; +extern struct __collate_st_chain_pri *__collate_chain_pri_table; + +u_char *__collate_strdup(u_char *); +u_char *__collate_substitute(const u_char *); +int __collate_load_tables(const char *); +void __collate_lookup(const u_char *, int *, int *, int *); +int __collate_range_cmp(int, int); +#ifdef COLLATE_DEBUG +void __collate_print_tables(void); +#endif + +#endif /* !_COLLATE_H_ */ diff --git a/src/lib/libc_old/locale/tolower.c b/src/lib/libc_old/locale/tolower.c index 72888c6..9521296 100644 --- a/src/lib/libc_old/locale/tolower.c +++ b/src/lib/libc_old/locale/tolower.c @@ -20,7 +20,7 @@ $Id$ **************************************************************************************/ -int tolower (int c) { +int ___tolower (int c) { if (c >= 'A' && c <= 'Z') c += ('a' - 'A'); return c; }