Remove pre-ISO C support

[thirdparty/glibc.git] / include / libintl.h

diff --git a/include/libintl.h b/include/libintl.h
index 40342e90c44dd3220fffde3647d32c99deca6c65..d15a6c0a05f00766ba7df4f1e64c73d8dcfde5c6 100644 (file)
--- a/include/libintl.h
+++ b/include/libintl.h
@@ -1,12 +1,48 @@
 #ifndef _LIBINTL_H
 #include <intl/libintl.h>
+#include <locale.h>
 
 /* Now define the internal interfaces.  */
-extern char *__gettext __P ((__const char *__msgid));
-extern char *__textdomain __P ((__const char *__domainname));
-extern char *__bindtextdomain __P ((__const char *__domainname,
-                                   __const char *__dirname));
+extern char *__gettext (const char *__msgid)
+     __attribute_format_arg__ (1);
+extern char *__dgettext (const char *__domainname,
+                        const char *__msgid)
+     __attribute_format_arg__ (2);
+extern char *__dcgettext (const char *__domainname,
+                         const char *__msgid, int __category)
+     __attribute_format_arg__ (2);
+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,
+                        unsigned long int __n)
+     __attribute_format_arg__ (1) __attribute_format_arg__ (2);
+extern char *__dngettext (const char *__domainname,
+                         const char *__msgid1, const char *__msgid2,
+                         unsigned long int __n)
+     __attribute_format_arg__ (2) __attribute_format_arg__ (3);
+extern char *__dcngettext (const char *__domainname,
+                          const char *__msgid1, const char *__msgid2,
+                          unsigned long int __n, int __category)
+     __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 *__bindtextdomain (const char *__domainname,
+                              const char *__dirname);
+extern char *__bind_textdomain_codeset (const char *__domainname,
+                                       const char *__codeset);
+
 extern const char _libc_intl_domainname[];
+libc_hidden_proto (_libc_intl_domainname)
 
 /* Define the macros `_' and `N_' for conveniently marking translatable
    strings in the libc source code.  We have to make sure we get the
@@ -16,13 +52,8 @@ extern const char _libc_intl_domainname[];
 # define N_(msgid)     msgid
 
 # undef _
-# ifdef dgettext
 /* This is defined as an optimizing macro, so use it.  */
-#  define _(msgid)     dgettext (_libc_intl_domainname, (msgid))
-# else
-/* Be sure to use only the __ name when `dgettext' is a plain function
-   instead of an optimizing macro.  */
-#  define _(msgid)     __dgettext (_libc_intl_domainname, (msgid))
-# endif
+# define _(msgid) \
+  __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
 
 #endif