diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-05-23 22:38:10 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-05-24 23:08:18 +0200 |
| commit | 56d25bb888ac7ba977091c2b48401b0a443fc94a (patch) | |
| tree | 0259bcfd200f965f77ca2c0d2afb79e6b0b6308b /intl | |
| parent | d18ea0c5e669dd48ccceccfc90ff458dc333a81f (diff) | |
| download | glibc-56d25bb888ac7ba977091c2b48401b0a443fc94a.tar glibc-56d25bb888ac7ba977091c2b48401b0a443fc94a.tar.gz glibc-56d25bb888ac7ba977091c2b48401b0a443fc94a.tar.bz2 glibc-56d25bb888ac7ba977091c2b48401b0a443fc94a.zip | |
Remove use of INTDEF/INTUSE in intl
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/dcgettext.c | 3 | ||||
| -rw-r--r-- | intl/dgettext.c | 4 | ||||
| -rw-r--r-- | intl/gettext.c | 4 | ||||
| -rw-r--r-- | intl/l10nflist.c | 11 |
4 files changed, 6 insertions, 16 deletions
diff --git a/intl/dcgettext.c b/intl/dcgettext.c index 3074340d1a..0f2942be45 100644 --- a/intl/dcgettext.c +++ b/intl/dcgettext.c @@ -1,5 +1,5 @@ /* Implementation of the dcgettext(3) function. - Copyright (C) 1995-2002, 2005 Free Software Foundation, Inc. + Copyright (C) 1995-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -54,7 +54,6 @@ DCGETTEXT (domainname, msgid, category) #ifdef _LIBC /* Alias for function name in GNU C Library. */ -INTDEF(__dcgettext) weak_alias (__dcgettext, dcgettext); libc_hidden_def (__dcgettext) #endif diff --git a/intl/dgettext.c b/intl/dgettext.c index d805f982c5..7718f4e4e0 100644 --- a/intl/dgettext.c +++ b/intl/dgettext.c @@ -1,5 +1,5 @@ /* Implementation of the dgettext(3) function. - Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -37,7 +37,7 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define DGETTEXT __dgettext -# define DCGETTEXT INTUSE(__dcgettext) +# define DCGETTEXT __dcgettext #else # define DGETTEXT libintl_dgettext # define DCGETTEXT libintl_dcgettext diff --git a/intl/gettext.c b/intl/gettext.c index b24b62339b..fbc598407d 100644 --- a/intl/gettext.c +++ b/intl/gettext.c @@ -1,5 +1,5 @@ /* Implementation of gettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -42,7 +42,7 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define GETTEXT __gettext -# define DCGETTEXT INTUSE(__dcgettext) +# define DCGETTEXT __dcgettext #else # define GETTEXT libintl_gettext # define DCGETTEXT libintl_dcgettext diff --git a/intl/l10nflist.c b/intl/l10nflist.c index b67f8d4235..32d8a01b5b 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2002, 2004, 2005, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. @@ -85,10 +85,6 @@ argz_count__ (argz, len) } # undef __argz_count # define __argz_count(argz, len) argz_count__ (argz, len) -#else -# ifdef _LIBC -# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len) -# endif #endif /* !_LIBC && !HAVE___ARGZ_COUNT */ #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY @@ -113,11 +109,6 @@ argz_stringify__ (argz, len, sep) } # undef __argz_stringify # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) -#else -# ifdef _LIBC -# define __argz_stringify(argz, len, sep) \ - INTUSE(__argz_stringify) (argz, len, sep) -# endif #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ #if !defined _LIBC && !defined HAVE___ARGZ_NEXT |