ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
/* Implementation of ngettext(3) function.
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
|
|
under the terms of the GNU Library General Public License as published
|
|
|
|
by the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with this program; if not, write to the Free Software
|
2005-05-13 10:03:47 +02:00
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
USA. */
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
# define __need_NULL
|
|
|
|
# include <stddef.h>
|
|
|
|
#else
|
|
|
|
# include <stdlib.h> /* Just for NULL. */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "gettextP.h"
|
|
|
|
#ifdef _LIBC
|
|
|
|
# include <libintl.h>
|
|
|
|
#else
|
|
|
|
# include "libgnuintl.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <locale.h>
|
|
|
|
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
|
|
|
|
/* Names for the libintl functions are a problem. They must not clash
|
|
|
|
with existing names and they should follow ANSI C. But this source
|
|
|
|
code is also used in GNU C Library where the names have a __
|
|
|
|
prefix. So we have to make a difference here. */
|
|
|
|
#ifdef _LIBC
|
|
|
|
# define NGETTEXT __ngettext
|
|
|
|
# define DCNGETTEXT __dcngettext
|
|
|
|
#else
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
# define NGETTEXT libintl_ngettext
|
|
|
|
# define DCNGETTEXT libintl_dcngettext
|
ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
top:
* ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.
* configure.in, Makefile.in: Take out obsolete check-po logic.
* configure, config.in: Regenerate.
intl:
* Update entire directory from gettext 0.10.40.
* cat-compat.c, linux-msg.sed, po2tbl.sed.in, xopen-msg.sed:
Removed.
* config.charset, dcigettext.c, dcngettext.c, libgnuintl.h,
localcharset.c, locale.alias, ngettext.c, plural.c, plural.y,
ref-add.sin, ref-del.sin: New.
po:
* Makefile.in.in: Upgrade to gettext-0.10.40.
* cat-id-tbl.c: Remove file.
* stamp-cat-id: Remove file.
From-SVN: r46233
2001-10-12 19:24:30 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Look up MSGID in the current default message catalog for the current
|
|
|
|
LC_MESSAGES locale. If not found, returns MSGID itself (the default
|
|
|
|
text). */
|
|
|
|
char *
|
|
|
|
NGETTEXT (msgid1, msgid2, n)
|
|
|
|
const char *msgid1;
|
|
|
|
const char *msgid2;
|
|
|
|
unsigned long int n;
|
|
|
|
{
|
|
|
|
return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
/* Alias for function name in GNU C Library. */
|
|
|
|
weak_alias (__ngettext, ngettext);
|
|
|
|
#endif
|