2000-04-27 Bruno Haible <clisp.cons.org>

	* intl/ngettext.c [!_LIBC]: Fix definition of NGETTEXT.

	* intl/loadinfo.h (internal_function): Define if not already defined.

2000-04-27  Andreas Jaeger  <aj@suse.de>

	* intl/libintl.h: Fix typo, reported by Bruno Haible
	<clisp.cons.org>.

diff --git a/intl/libintl.h b/intl/libintl.h
index 91e73265dcfb55b875d4a287bbab843c631b52ff..0f147228dfb90c8c70e999c60683fc5c4e4a9c6d 100644 (file)
--- a/intl/libintl.h
+++ b/intl/libintl.h
@@ -60,7 +60,7 @@ extern char *dngettext (__const char *__domainname, __const char *__msgid1,
                        __const char *__msgid2, unsigned long int __n)
      __THROW __attribute__ ((__format_arg__ (2)));
 
-/* Similar to `dxgettext' but select the plural form corresponding to the
+/* Similar to `dcgettext' but select the plural form corresponding to the
    number N.  */
 extern char *dcngettext (__const char *__domainname, __const char *__msgid1,
                         __const char *__msgid2, unsigned long int __n,

diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 009abcc62018638f8fe3898ca55f46a3425e05a7..585ed11c5eaada077eb119e79a67627e2b7b5e61 100644 (file)
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -28,6 +28,10 @@
 # endif
 #endif
 
+#ifndef internal_function
+# define internal_function
+#endif
+
 /* Encoding of locale name parts.  */
 #define CEN_REVISION           1
 #define CEN_SPONSOR            2

diff --git a/intl/ngettext.c b/intl/ngettext.c
index 1addf87752b3701f7f4dc0e76c5bafa360884613..5340732046a0c6f23aa1845e6c854fea8f53e1e9 100644 (file)
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -55,7 +55,7 @@
 # define NGETTEXT __ngettext
 # define DCNGETTEXT __dcngettext
 #else
-# define NGETTEXT gettext__
+# define NGETTEXT ngettext__
 # define DCNGETTEXT dcngettext__
 #endif