yann@1819: From d75ad2e129b3f22296cead3db53c784527deab60 Mon Sep 17 00:00:00 2001
yann@1819: From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
yann@1819: Date: Fri, 18 Sep 2009 14:07:31 +0000
yann@1819: Subject: fix make {,install_}{,host}utils
yann@1819: 
yann@1819: Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
yann@1819: ---
yann@1819: diff --git a/extra/locale/programs/locale.c b/extra/locale/programs/locale.c
yann@1819: index 462a579..dfd2029 100644
yann@1819: --- a/extra/locale/programs/locale.c
yann@1819: +++ b/extra/locale/programs/locale.c
yann@1819: @@ -10,10 +10,9 @@
yann@1819:   *
yann@1819:   */
yann@1819:  
yann@1819: -
yann@1819: +#include <string.h>
yann@1819:  #include <stdio.h>
yann@1819:  #include <stdlib.h>
yann@1819: -#include <string.h>
yann@1819:  #include <langinfo.h>
yann@1819:  #include <unistd.h>
yann@1819:  #ifdef __UCLIBC_HAS_GETOPT_LONG__
yann@1819: diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
yann@1819: index 290e680..3ce884d 100644
yann@1819: --- a/libc/misc/wchar/wchar.c
yann@1819: +++ b/libc/misc/wchar/wchar.c
yann@1819: @@ -171,7 +171,6 @@ extern size_t _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn,
yann@1819:  
yann@1819:  extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n,
yann@1819:  					const wchar_t **__restrict src, size_t wn) attribute_hidden;
yann@1819: -
yann@1819:  #endif /* _LIBC */
yann@1819:  /**********************************************************************/
yann@1819:  #ifdef L_btowc
yann@1819: @@ -1201,45 +1200,6 @@ typedef struct {
yann@1819:  	int skip_invalid_input;		/* To support iconv -c option. */
yann@1819:  } _UC_iconv_t;
yann@1819:  
yann@1819: -
yann@1819: -
yann@1819: -#ifdef L_iconv
yann@1819: -
yann@1819: -#include <iconv.h>
yann@1819: -#include <string.h>
yann@1819: -#include <endian.h>
yann@1819: -#include <byteswap.h>
yann@1819: -
yann@1819: -#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN)
yann@1819: -#error unsupported endianness for iconv
yann@1819: -#endif
yann@1819: -
yann@1819: -#ifndef __CTYPE_HAS_8_BIT_LOCALES
yann@1819: -#error currently iconv requires 8 bit locales
yann@1819: -#endif
yann@1819: -#ifndef __CTYPE_HAS_UTF_8_LOCALES
yann@1819: -#error currently iconv requires UTF-8 locales
yann@1819: -#endif
yann@1819: -
yann@1819: -
yann@1819: -enum {
yann@1819: -	IC_WCHAR_T = 0xe0,
yann@1819: -	IC_MULTIBYTE = 0xe0,
yann@1819: -#if __BYTE_ORDER == __BIG_ENDIAN
yann@1819: -	IC_UCS_4 =	0xec,
yann@1819: -	IC_UTF_32 = 0xe4,
yann@1819: -	IC_UCS_2 =	0xe2,
yann@1819: -	IC_UTF_16 = 0xea,
yann@1819: -#else
yann@1819: -	IC_UCS_4 =	0xed,
yann@1819: -	IC_UTF_32 = 0xe5,
yann@1819: -	IC_UCS_2 =	0xe3,
yann@1819: -	IC_UTF_16 = 0xeb,
yann@1819: -#endif
yann@1819: -	IC_UTF_8 = 2,
yann@1819: -	IC_ASCII = 1
yann@1819: -};
yann@1819: -
yann@1819:  /* For the multibyte
yann@1819:   * bit 0 means swap endian
yann@1819:   * bit 1 means 2 byte
yann@1819: @@ -1247,8 +1207,13 @@ enum {
yann@1819:   *
yann@1819:   */
yann@1819:  
yann@1819: +#if defined L_iconv && defined _LIBC
yann@1819: +/* Used externally only by iconv utility */
yann@1819:  extern const unsigned char __iconv_codesets[];
yann@1819:  libc_hidden_proto(__iconv_codesets)
yann@1819: +#endif
yann@1819: +
yann@1819: +#if defined L_iconv || defined L_iconv_main
yann@1819:  const unsigned char __iconv_codesets[] =
yann@1819:  	"\x0a\xe0""WCHAR_T\x00"		/* superset of UCS-4 but platform-endian */
yann@1819:  #if __BYTE_ORDER == __BIG_ENDIAN
yann@1819: @@ -1281,7 +1246,48 @@ const unsigned char __iconv_codesets[] =
yann@1819:  	"\x08\x02""UTF-8\x00"
yann@1819:  	"\x0b\x01""US-ASCII\x00"
yann@1819:  	"\x07\x01""ASCII";			/* Must be last! (special case to save a nul) */
yann@1819: +#endif
yann@1819: +#if defined L_iconv && defined _LIBC
yann@1819:  libc_hidden_data_def(__iconv_codesets)
yann@1819: +#endif
yann@1819: +
yann@1819: +
yann@1819: +#ifdef L_iconv
yann@1819: +
yann@1819: +#include <iconv.h>
yann@1819: +#include <string.h>
yann@1819: +#include <endian.h>
yann@1819: +#include <byteswap.h>
yann@1819: +
yann@1819: +#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN)
yann@1819: +#error unsupported endianness for iconv
yann@1819: +#endif
yann@1819: +
yann@1819: +#ifndef __CTYPE_HAS_8_BIT_LOCALES
yann@1819: +#error currently iconv requires 8 bit locales
yann@1819: +#endif
yann@1819: +#ifndef __CTYPE_HAS_UTF_8_LOCALES
yann@1819: +#error currently iconv requires UTF-8 locales
yann@1819: +#endif
yann@1819: +
yann@1819: +
yann@1819: +enum {
yann@1819: +	IC_WCHAR_T = 0xe0,
yann@1819: +	IC_MULTIBYTE = 0xe0,
yann@1819: +#if __BYTE_ORDER == __BIG_ENDIAN
yann@1819: +	IC_UCS_4 =	0xec,
yann@1819: +	IC_UTF_32 = 0xe4,
yann@1819: +	IC_UCS_2 =	0xe2,
yann@1819: +	IC_UTF_16 = 0xea,
yann@1819: +#else
yann@1819: +	IC_UCS_4 =	0xed,
yann@1819: +	IC_UTF_32 = 0xe5,
yann@1819: +	IC_UCS_2 =	0xe3,
yann@1819: +	IC_UTF_16 = 0xeb,
yann@1819: +#endif
yann@1819: +	IC_UTF_8 = 2,
yann@1819: +	IC_ASCII = 1
yann@1819: +};
yann@1819:  
yann@1819:  /* Experimentally off - libc_hidden_proto(strcasecmp) */
yann@1819:  
yann@1819: @@ -1575,6 +1581,4 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf,
yann@1819:  	}
yann@1819:  	return nrcount;
yann@1819:  }
yann@1819: -
yann@1819:  #endif
yann@1819: -
yann@1819: --
yann@1819: cgit v0.8.2.1