intl patches (13)

[Bruno Haible <bruno at clisp dot org>]

This is an addendum to my 2002-04-27 patch. To avoid portability problems
(on Woe32), it's best to not declare some functions twice. Instead, let the
private header file include the public header file.


2003-04-04  Bruno Haible  <bruno at clisp dot org>

	* intl/gettextP.h [!_LIBC]: Remove declarations of exported functions.
	Instead include libgnuintl.h.

diff -r -c3 glibc-20030425.orig/intl/gettextP.h glibc-20030425/intl/gettextP.h
--- glibc-20030425.orig/intl/gettextP.h	Mon Dec 16 12:45:53 2002
+++ glibc-20030425/intl/gettextP.h	Sun Apr 27 13:06:59 2003
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Ulrich Drepper <drepper at cygnus dot com>, 1995.
 
@@ -211,33 +211,15 @@
 extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
 						const char *__codeset));
 #else
-extern char *libintl_gettext PARAMS ((const char *__msgid));
-extern char *libintl_dgettext PARAMS ((const char *__domainname,
-				       const char *__msgid));
-extern char *libintl_dcgettext PARAMS ((const char *__domainname,
-					const char *__msgid, int __category));
-extern char *libintl_ngettext PARAMS ((const char *__msgid1,
-				       const char *__msgid2,
-				       unsigned long int __n));
-extern char *libintl_dngettext PARAMS ((const char *__domainname,
-					const char *__msgid1,
-					const char *__msgid2,
-					unsigned long int __n));
-extern char *libintl_dcngettext PARAMS ((const char *__domainname,
-					 const char *__msgid1,
-					 const char *__msgid2,
-					 unsigned long int __n,
-					 int __category));
+/* Declare the exported libintl_* functions, in a way that allows us to
+   call them under their real name.  */
+# define _INTL_REDIRECT_MACROS
+# include "libgnuintl.h"
 extern char *libintl_dcigettext PARAMS ((const char *__domainname,
 					 const char *__msgid1,
 					 const char *__msgid2,
 					 int __plural, unsigned long int __n,
 					 int __category));
-extern char *libintl_textdomain PARAMS ((const char *__domainname));
-extern char *libintl_bindtextdomain PARAMS ((const char *__domainname,
-					     const char *__dirname));
-extern char *libintl_bind_textdomain_codeset PARAMS ((const char *__domainname,
-						      const char *__codeset));
 #endif
 
 /* @@ begin of epilog @@ */