[uClibc-cvs] uClibc/libintl intl.c,1.1,1.2

[Manuel Novoa III]

Update of /var/cvs/uClibc/libintl
In directory winder:/tmp/cvs-serv5558/libintl

Modified Files:
	intl.c 
Log Message:
Rework a few things.


Index: intl.c
===================================================================
RCS file: /var/cvs/uClibc/libintl/intl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- intl.c	24 Aug 2003 03:49:13 -0000	1.1
+++ intl.c	1 Sep 2003 09:47:09 -0000	1.2
@@ -17,6 +17,9 @@
 
 /*
  *  Stub version of libintl.
+ *
+ *  Aug 30, 2003
+ *  Add some hidden names to support locale-enabled libstd++.
  */
 
 #include <stdlib.h>
@@ -44,26 +47,26 @@
 	return (char *) msgid;
 }
 
-weak_alias (__dgettext, dgettext)
+strong_alias(__dgettext, dgettext)
 
 #endif
 /**********************************************************************/
 #ifdef L_dcgettext
 
-char * __dcgettext(const char *domainname,
-				   const char *msgid, int category)
+char *__dcgettext(const char *domainname,
+				  const char *msgid, int category)
 {
 	return (char *) msgid;
 }
 
-weak_alias (__dcgettext, dcgettext)
+strong_alias(__dcgettext, dcgettext)
 
 #endif
 /**********************************************************************/
 #ifdef L_ngettext
 
 char *ngettext(const char *msgid1, const char *msgid2,
-							 unsigned long int n)
+			   unsigned long int n)
 {
 	return (char *) ((n == 1) ? msgid1 : msgid2);
 }
@@ -73,7 +76,7 @@
 #ifdef L_dngettext
 
 char *dngettext(const char *domainname, const char *msgid1,
-							  const char *msgid2, unsigned long int n)
+				const char *msgid2, unsigned long int n)
 {
 	return (char *) ((n == 1) ? msgid1 : msgid2);
 }
@@ -83,8 +86,8 @@
 #ifdef L_dcngettext
 
 char *dcngettext(const char *domainname, const char *msgid1,
-							   const char *msgid2, unsigned long int n,
-							   int category)
+				 const char *msgid2, unsigned long int n,
+				 int category)
 {
 	return (char *) ((n == 1) ? msgid1 : msgid2);
 }
@@ -93,7 +96,7 @@
 /**********************************************************************/
 #ifdef L_textdomain
 
-char *textdomain(const char *domainname)
+char *__textdomain(const char *domainname)
 {
 	static const char default_str[] = "messages";
 
@@ -104,11 +107,13 @@
 	return (char *) default_str;
 }
 
+strong_alias(__textdomain, textdomain)
+
 #endif
 /**********************************************************************/
 #ifdef L_bindtextdomain
 
-char *bindtextdomain(const char *domainname, const char *dirname)
+char *__bindtextdomain(const char *domainname, const char *dirname)
 {
 	static const char dir[] = "/";
 
@@ -128,6 +133,8 @@
 	return (char *) dir;
 }
 
+strong_alias(__bindtextdomain, bindtextdomain)
+
 #endif
 /**********************************************************************/
 #ifdef L_bind_textdomain_codeset
@@ -151,7 +158,7 @@
 
 const char *_nl_expand_alias(const char * name)
 {
-	return NULL;				/* uClibc does not support locale aliases. */
+	return NULL;		 /* uClibc does not support locale aliases. */
 }
 
 #endif