diff options
Diffstat (limited to 'newlib/libc/iconv/lib/deps.h')
| -rw-r--r-- | newlib/libc/iconv/lib/deps.h | 70 |
1 files changed, 34 insertions, 36 deletions
diff --git a/newlib/libc/iconv/lib/deps.h b/newlib/libc/iconv/lib/deps.h index c98621195..6edb7c35f 100644 --- a/newlib/libc/iconv/lib/deps.h +++ b/newlib/libc/iconv/lib/deps.h @@ -23,72 +23,70 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifdef ENABLE_ICONV - #ifndef __ICONV_DEPS_H__ #define __ICONV_DEPS_H__ +#include <newlib.h> + /* * EUC-JP requires us_ascii, jis_x0208_1983, jis_x0201, jis_x0212_1990 */ -#ifdef ICONV_CONVERTER_EUC_JP -# ifndef ICONV_CONVERTER_US_ASCII -# define ICONV_CONVERTER_US_ASCII +#ifdef _ICONV_CONVERTER_EUC_JP +# ifndef _ICONV_CONVERTER_US_ASCII +# define _ICONV_CONVERTER_US_ASCII # endif -# ifndef ICONV_CONVERTER_JIS_X0208_1983 -# define ICONV_CONVERTER_JIS_X0208_1983 +# ifndef _ICONV_CONVERTER_JIS_X0208_1983 +# define _ICONV_CONVERTER_JIS_X0208_1983 # endif -# ifndef ICONV_CONVERTER_JIS_X0201 -# define ICONV_CONVERTER_JIS_X0201 +# ifndef _ICONV_CONVERTER_JIS_X0201 +# define _ICONV_CONVERTER_JIS_X0201 # endif -# ifndef ICONV_CONVERTER_JIS_X0212_1990 -# define ICONV_CONVERTER_JIS_X0212_1990 +# ifndef _ICONV_CONVERTER_JIS_X0212_1990 +# define _ICONV_CONVERTER_JIS_X0212_1990 # endif -#endif /* #ifdef ICONV_CONVERTER_EUC_JP */ +#endif /* #ifdef _ICONV_CONVERTER_EUC_JP */ /* * EUC-KR requires us_ascii, ksx1001 */ -#ifdef ICONV_CONVERTER_EUC_KR -# ifndef ICONV_CONVERTER_US_ASCII -# define ICONV_CONVERTER_US_ASCII +#ifdef _ICONV_CONVERTER_EUC_KR +# ifndef _ICONV_CONVERTER_US_ASCII +# define _ICONV_CONVERTER_US_ASCII # endif -# ifndef ICONV_CONVERTER_KSX_1001 -# define ICONV_CONVERTER_KSX_1001 +# ifndef _ICONV_CONVERTER_KSX_1001 +# define _ICONV_CONVERTER_KSX_1001 # endif -#endif /* #ifdef ICONV_CONVERTER_EUC_KR */ +#endif /* #ifdef _ICONV_CONVERTER_EUC_KR */ /* * EUC-TW requires us_ascii, cns11643_plane1, cns11643_plane2, cns11643_plane14 */ -#ifdef ICONV_CONVERTER_EUC_TW -# ifndef ICONV_CONVERTER_US_ASCII -# define ICONV_CONVERTER_US_ASCII +#ifdef _ICONV_CONVERTER_EUC_TW +# ifndef _ICONV_CONVERTER_US_ASCII +# define _ICONV_CONVERTER_US_ASCII # endif -# ifndef ICONV_CONVERTER_CNS11643_PLANE1 -# define ICONV_CONVERTER_CNS11643_PLANE1 +# ifndef _ICONV_CONVERTER_CNS11643_PLANE1 +# define _ICONV_CONVERTER_CNS11643_PLANE1 # endif -# ifndef ICONV_CONVERTER_CNS11643_PLANE2 -# define ICONV_CONVERTER_CNS11643_PLANE2 +# ifndef _ICONV_CONVERTER_CNS11643_PLANE2 +# define _ICONV_CONVERTER_CNS11643_PLANE2 # endif -# ifndef ICONV_CONVERTER_CNS11643_PLANE14 -# define ICONV_CONVERTER_CNS11643_PLANE14 +# ifndef _ICONV_CONVERTER_CNS11643_PLANE14 +# define _ICONV_CONVERTER_CNS11643_PLANE14 # endif -#endif /* #ifdef ICONV_CONVERTER_EUC_TW */ +#endif /* #ifdef _ICONV_CONVERTER_EUC_TW */ /* * GB2380 CES requires us_ascii, gb-2312-80 CCS */ -#ifdef ICONV_CONVERTER_GB2312 -# ifndef ICONV_CONVERTER_US_ASCII -# define ICONV_CONVERTER_US_ASCII +#ifdef _ICONV_CONVERTER_GB2312 +# ifndef _ICONV_CONVERTER_US_ASCII +# define _ICONV_CONVERTER_US_ASCII # endif -# ifndef ICONV_CONVERTER_GB_2312_80 -# define ICONV_CONVERTER_GB_2312_80 +# ifndef _ICONV_CONVERTER_GB_2312_80 +# define _ICONV_CONVERTER_GB_2312_80 # endif -#endif /* #ifdef ICONV_CONVERTER_GB2312 */ +#endif /* #ifdef _ICONV_CONVERTER_GB2312 */ #endif /* #ifndef __ICONV_DEPS_H__ */ -#endif /* #ifdef ENABLE_ICONV */ - |