do not provide /usr/lib/locale

[platform/upstream/glibc.git] / include / libintl.h

diff --git a/include/libintl.h b/include/libintl.h
index 99f7787..0551a04 100644 (file)
--- a/include/libintl.h
+++ b/include/libintl.h
@@ -3,21 +3,36 @@
 #include <locale.h>
 
 /* Now define the internal interfaces.  */
-extern char *__gettext (__const char *__msgid);
-extern char *__dgettext (__const char *__domainname,
-                        __const char *__msgid);
-extern char *__dcgettext (__const char *__domainname,
-                         __const char *__msgid, int __category);
-extern char *__dcgettext_internal (__const char *__domainname,
-                                  __const char *__msgid, int __category)
-     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 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 *__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 *__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[];
-extern const char _libc_intl_domainname_internal[] attribute_hidden;
+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
@@ -28,12 +43,7 @@ extern const char _libc_intl_domainname_internal[] attribute_hidden;
 
 # undef _
 /* This is defined as an optimizing macro, so use it.  */
-# if !defined NOT_IN_libc && defined SHARED
-#  define _(msgid) \
-  __dcgettext_internal (_libc_intl_domainname_internal, (msgid), LC_MESSAGES)
-# else
-#  define _(msgid) \
-  __dcgettext (_libc_intl_domainname, (msgid), LC_MESSAGES)
-#endif
+# define _(msgid) \
+  __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
 
 #endif