From 50aba30aee11d4fa51948c6ba258ec0bbdbae8c0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 1 Dec 2016 19:08:52 +0100 Subject: remove libintl stub and libintl.h header As __UCLIBC_HAS_GETTEXT_AWARENESS__ is never defined, this is mostly dead code. It is planned to integrate libiconv-tiny and gettext-tiny into uClibc-ng after the next release, so that more software packages can be used without modification. Remove any _/_N macro usage. --- libintl/Makefile | 13 ----- libintl/Makefile.in | 43 --------------- libintl/intl.c | 154 ---------------------------------------------------- 3 files changed, 210 deletions(-) delete mode 100644 libintl/Makefile delete mode 100644 libintl/Makefile.in delete mode 100644 libintl/intl.c (limited to 'libintl') diff --git a/libintl/Makefile b/libintl/Makefile deleted file mode 100644 index c8dc9b466..000000000 --- a/libintl/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -top_srcdir=../ -top_builddir=../ -include $(top_builddir)Rules.mak -all: libs -include Makefile.in -include $(top_srcdir)Makerules diff --git a/libintl/Makefile.in b/libintl/Makefile.in deleted file mode 100644 index b54e23dad..000000000 --- a/libintl/Makefile.in +++ /dev/null @@ -1,43 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2008 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -subdirs += libintl - -CFLAGS-libintl := -DNOT_IN_libc -DIS_IN_libintl $(SSP_ALL_CFLAGS) - -MOBJ := \ - gettext.o ngettext.o dgettext.o dcgettext.o dngettext.o dcngettext.o \ - textdomain.o bindtextdomain.o bind_textdomain_codeset.o \ - _nl_expand_alias.o _nl_msg_cat_cntr.o # glibc-isms - -libintl_DIR := $(top_srcdir)libintl -libintl_OUT := $(top_builddir)libintl - -libintl_MSRC := $(libintl_DIR)/intl.c -libintl_MOBJ := $(patsubst %.o,$(libintl_OUT)/%.o,$(MOBJ)) - -ifeq ($(DOPIC),y) -libintl-a-y := $(libintl_MOBJ:.o=.os) -else -libintl-a-y := $(libintl_MOBJ) -endif -libintl-so-y := $(libintl_MOBJ:.o=.os) - -objclean-y += CLEAN_libintl - -$(libintl_OUT)/libintl.oS: $(libintl_MSRC) - $(Q)$(RM) $@ - $(compile-m) - -$(libintl_MOBJ): $(libintl_MSRC) - $(compile.m) - -$(libintl_MOBJ:.o=.os): $(libintl_MSRC) - $(compile.m) - -CLEAN_libintl: - $(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a) diff --git a/libintl/intl.c b/libintl/intl.c deleted file mode 100644 index e42a999cb..000000000 --- a/libintl/intl.c +++ /dev/null @@ -1,154 +0,0 @@ -/* Copyright (C) 2003 Manuel Novoa III - * Copyright (C) 2000-2006 Erik Andersen - * - * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - */ - -/* - * Stub version of libintl. - * - * Aug 30, 2003 - * Add some hidden names to support locale-enabled libstd++. - */ - -#include -#include -#include - -#undef __OPTIMIZE__ -#include - -/**********************************************************************/ -#ifdef L_gettext - -char *gettext(const char *msgid) -{ - return (char *) msgid; -} - -#endif -/**********************************************************************/ -#ifdef L_dgettext - -char *dgettext(const char *domainname, - const char *msgid) -{ - return (char *) msgid; -} - -#endif -/**********************************************************************/ -#ifdef L_dcgettext - -char *dcgettext(const char *domainname, - const char *msgid, int category) -{ - return (char *) msgid; -} - -#endif -/**********************************************************************/ -#ifdef L_ngettext - -char *ngettext(const char *msgid1, const char *msgid2, - unsigned long int n) -{ - return (char *) ((n == 1) ? msgid1 : msgid2); -} - -#endif -/**********************************************************************/ -#ifdef L_dngettext - -char *dngettext(const char *domainname, const char *msgid1, - const char *msgid2, unsigned long int n) -{ - return (char *) ((n == 1) ? msgid1 : msgid2); -} - -#endif -/**********************************************************************/ -#ifdef L_dcngettext - -char *dcngettext(const char *domainname, const char *msgid1, - const char *msgid2, unsigned long int n, - int category) -{ - return (char *) ((n == 1) ? msgid1 : msgid2); -} - -#endif -/**********************************************************************/ -#ifdef L_textdomain - -char *textdomain(const char *domainname) -{ - static const char default_str[] = "messages"; - - if (domainname && *domainname && strcmp(domainname, default_str)) { - __set_errno(EINVAL); - return NULL; - } - return (char *) default_str; -} - -#endif -/**********************************************************************/ -#ifdef L_bindtextdomain - -char *bindtextdomain(const char *domainname, const char *dirname) -{ - static const char dir[] = "/"; - - if (!domainname || !*domainname - || (dirname -#if 1 - && ((dirname[0] != '/') || dirname[1]) -#else - && strcmp(dirname, dir) -#endif - ) - ) { - __set_errno(EINVAL); - return NULL; - } - - return (char *) dir; -} - -#endif -/**********************************************************************/ -#ifdef L_bind_textdomain_codeset - -/* Specify the character encoding in which the messages from the - DOMAINNAME message catalog will be returned. */ -char *bind_textdomain_codeset(const char *domainname, const char *codeset) -{ - if (!domainname || !*domainname || codeset) { - __set_errno(EINVAL); - } - return NULL; -} - -#endif -/**********************************************************************/ -#ifdef L__nl_expand_alias - -/* glibc-ism */ - -const char *_nl_expand_alias(const char * name); -const char *_nl_expand_alias(const char * name) -{ - return NULL; /* uClibc does not support locale aliases. */ -} - -#endif -/**********************************************************************/ -#ifdef L__nl_msg_cat_cntr - -/* glibc-ism */ - -int _nl_msg_cat_cntr = 0; - -#endif -/**********************************************************************/ -- cgit v1.2.3