lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Remove use of INTDEF/INTUSE in intl

Browse Source
This commit is contained in:
Andreas Schwab
2012-05-23 22:38:10 +02:00
parent d18ea0c5e6
commit 56d25bb888
12 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,6 +1,23 @@
2012-05-24 Andreas Schwab <schwab@linux-m68k.org> 2012-05-24 Andreas Schwab <schwab@linux-m68k.org>
[BZ #14132] [BZ #14132]
* argp/argp-help.c (dgettext) [_LIBC]: Remove use of INTUSE.
* argp/argp-parse.c (dgettext) [_LIBC]: Likewise.
* intl/dgettext.c (DCGETTEXT): Likewise.
* intl/gettext.c (DCGETTEXT): Likewise.
* intl/l10nflist.c (__argz_count, __argz_stringify): Likewise.
* posix/regex_internal.h (gettext): Likewise.
* include/libintl.h (__dcgettext_internal, __dcngettext_internal):
Remove declaration.
* include/argz.h (__argz_count_internal)
(__argz_stringify_internal): Remove declaration.
(__argz_count, __argz_stringify): Declare hidden proto.
* intl/dcgettext.c: Remove use of INTDEF.
* string/argz-count.c: Replace INTDEF with libc_hidden_def.
* string/argz-stringify.c: Likewise.
* include/libio.h (_IO_free_backup_area, _IO_free_wbackup_area)
(_IO_padn, _IO_putc, _IO_sgetn, _IO_vfprintf, _IO_vfscanf):
Declare hidden proto.
* include/libio.h (_IO_free_backup_area, _IO_free_wbackup_area) * include/libio.h (_IO_free_backup_area, _IO_free_wbackup_area)
(_IO_padn, _IO_putc, _IO_sgetn, _IO_vfprintf, _IO_vfscanf): (_IO_padn, _IO_putc, _IO_sgetn, _IO_vfprintf, _IO_vfscanf):
Declare hidden proto. Declare hidden proto.

4
argp/argp-help.c
View File

@ -1,5 +1,5 @@
/* Hierarchial argument parsing help output /* Hierarchial argument parsing help output
Copyright (C) 1995-2007, 2011 Free Software Foundation, Inc. Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>. Written by Miles Bader <miles@gnu.ai.mit.edu>.
@ -59,7 +59,7 @@ char *alloca ();
# ifdef _LIBC # ifdef _LIBC
# undef dgettext # undef dgettext
# define dgettext(domain, msgid) \ # define dgettext(domain, msgid) \
INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES) __dcgettext (domain, msgid, LC_MESSAGES)
# endif # endif
# else # else
# define dgettext(domain, msgid) (msgid) # define dgettext(domain, msgid) (msgid)

4
argp/argp-parse.c
View File

@ -1,5 +1,5 @@
/* Hierarchial argument parsing, layered over getopt /* Hierarchial argument parsing, layered over getopt
Copyright (C) 1995-2000, 2002, 2003, 2004, 2010 Free Software Foundation, Inc. Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>. Written by Miles Bader <miles@gnu.ai.mit.edu>.
@ -51,7 +51,7 @@ char *alloca ();
# ifdef _LIBC # ifdef _LIBC
# undef dgettext # undef dgettext
# define dgettext(domain, msgid) \ # define dgettext(domain, msgid) \
INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES) __dcgettext (domain, msgid, LC_MESSAGES)
# endif # endif
# else # else
# define dgettext(domain, msgid) (msgid) # define dgettext(domain, msgid) (msgid)

7
include/argz.h
View File

@ -3,10 +3,7 @@
#include <string/argz.h> #include <string/argz.h>
libc_hidden_proto (argz_delete) libc_hidden_proto (argz_delete)
libc_hidden_proto (__argz_count)
extern size_t __argz_count_internal (const char *__argz, size_t __len) libc_hidden_proto (__argz_stringify)
__attribute_pure__ attribute_hidden;
extern void __argz_stringify_internal (char *__argz, size_t __len, int __sep)
attribute_hidden;
#endif #endif

10
include/libintl.h
View File

@ -12,10 +12,6 @@ extern char *__dcgettext (const char *__domainname,
const char *__msgid, int __category) const char *__msgid, int __category)
__attribute_format_arg__ (2); __attribute_format_arg__ (2);
libc_hidden_proto (__dcgettext) libc_hidden_proto (__dcgettext)
extern char *__dcgettext_internal (const char *__domainname,
const char *__msgid, int __category)
__attribute_format_arg__ (2)
attribute_hidden;
extern char *__ngettext (const char *__msgid1, const char *__msgid2, extern char *__ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n) unsigned long int __n)
@ -28,12 +24,6 @@ extern char *__dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2, const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category) unsigned long int __n, int __category)
__attribute_format_arg__ (2) __attribute_format_arg__ (3); __attribute_format_arg__ (2) __attribute_format_arg__ (3);
extern char *__dcngettext_internal (const char *__domainname,
const char *__msgid1,
const char *__msgid2,
unsigned long int __n, int __category)
__attribute_format_arg__ (2) __attribute_format_arg__ (3)
attribute_hidden;
extern char *__textdomain (const char *__domainname); extern char *__textdomain (const char *__domainname);
extern char *__bindtextdomain (const char *__domainname, extern char *__bindtextdomain (const char *__domainname,

3
intl/dcgettext.c
View File

@ -1,5 +1,5 @@
/* Implementation of the dcgettext(3) function. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -54,7 +54,6 @@ DCGETTEXT (domainname, msgid, category)
#ifdef _LIBC #ifdef _LIBC
/* Alias for function name in GNU C Library. */ /* Alias for function name in GNU C Library. */
INTDEF(__dcgettext)
weak_alias (__dcgettext, dcgettext); weak_alias (__dcgettext, dcgettext);
libc_hidden_def (__dcgettext) libc_hidden_def (__dcgettext)
#endif #endif

4
intl/dgettext.c
View File

@ -1,5 +1,5 @@
/* Implementation of the dgettext(3) function. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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. */ prefix. So we have to make a difference here. */
#ifdef _LIBC #ifdef _LIBC
# define DGETTEXT __dgettext # define DGETTEXT __dgettext
# define DCGETTEXT INTUSE(__dcgettext) # define DCGETTEXT __dcgettext
#else #else
# define DGETTEXT libintl_dgettext # define DGETTEXT libintl_dgettext
# define DCGETTEXT libintl_dcgettext # define DCGETTEXT libintl_dcgettext

4
intl/gettext.c
View File

@ -1,5 +1,5 @@
/* Implementation of gettext(3) function. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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. */ prefix. So we have to make a difference here. */
#ifdef _LIBC #ifdef _LIBC
# define GETTEXT __gettext # define GETTEXT __gettext
# define DCGETTEXT INTUSE(__dcgettext) # define DCGETTEXT __dcgettext
#else #else
# define GETTEXT libintl_gettext # define GETTEXT libintl_gettext
# define DCGETTEXT libintl_dcgettext # define DCGETTEXT libintl_dcgettext

11
intl/l10nflist.c
View File

@ -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. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@ -85,10 +85,6 @@ argz_count__ (argz, len)
} }
# undef __argz_count # undef __argz_count
# define __argz_count(argz, len) argz_count__ (argz, len) # 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 */ #endif /* !_LIBC && !HAVE___ARGZ_COUNT */
#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
@ -113,11 +109,6 @@ argz_stringify__ (argz, len, sep)
} }
# undef __argz_stringify # undef __argz_stringify
# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) # 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 */ #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
#if !defined _LIBC && !defined HAVE___ARGZ_NEXT #if !defined _LIBC && !defined HAVE___ARGZ_NEXT

4
posix/regex_internal.h
View File

@ -1,5 +1,5 @@
/* Extended regular expression matching and search library. /* Extended regular expression matching and search library.
Copyright (C) 2002-2005, 2007, 2008, 2011 Free Software Foundation, Inc. Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@ -73,7 +73,7 @@
# ifdef _LIBC # ifdef _LIBC
# undef gettext # undef gettext
# define gettext(msgid) \ # define gettext(msgid) \
INTUSE(__dcgettext) (_libc_intl_domainname, msgid, LC_MESSAGES) __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
# endif # endif
#else #else
# define gettext(msgid) (msgid) # define gettext(msgid) (msgid)

4
string/argz-count.c
View File

@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors. /* Routines for dealing with '\0' separated arg vectors.
Copyright (C) 1995, 1996, 1997, 2002 Free Software Foundation, Inc. Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu> Written by Miles Bader <miles@gnu.ai.mit.edu>
@ -34,5 +34,5 @@ __argz_count (const char *argz, size_t len)
} }
return count; return count;
} }
INTDEF(__argz_count) libc_hidden_def (__argz_count)
weak_alias (__argz_count, argz_count) weak_alias (__argz_count, argz_count)

4
string/argz-stringify.c
View File

@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors. /* Routines for dealing with '\0' separated arg vectors.
Copyright (C) 1995,96,97,2000,2001, 2002 Free Software Foundation, Inc. Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.org> Written by Miles Bader <miles@gnu.org>
@ -36,5 +36,5 @@ __argz_stringify (char *argz, size_t len, int sep)
*argz++ = sep; *argz++ = sep;
} }
} }
INTDEF(__argz_stringify) libc_hidden_def (__argz_stringify)
weak_alias (__argz_stringify, argz_stringify) weak_alias (__argz_stringify, argz_stringify)