projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brand new flag, to spot a whole lot of new errors.
[apps/madmutt.git]
/
intl
/
textdomain.c
diff --git
a/intl/textdomain.c
b/intl/textdomain.c
index
2e420ad
..
c316460
100644
(file)
--- a/
intl/textdomain.c
+++ b/
intl/textdomain.c
@@
-1,5
+1,5
@@
/* Implementation of the textdomain(3) function.
/* Implementation of the textdomain(3) function.
- Copyright (C) 1995-1998, 2000
, 2001
Free Software Foundation, Inc.
+ Copyright (C) 1995-1998, 2000
-2003, 2005-2006
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@
-13,7
+13,7
@@
You should have received a copy of the GNU Library General Public
License along with this program; if not, write to the Free Software
You should have received a copy of the GNU Library General Public
License along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
,
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
,
USA. */
#ifdef HAVE_CONFIG_H
USA. */
#ifdef HAVE_CONFIG_H
@@
-23,38
+23,38
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
+#include "gettextP.h"
#ifdef _LIBC
# include <libintl.h>
#else
# include "libgnuintl.h"
#endif
#ifdef _LIBC
# include <libintl.h>
#else
# include "libgnuintl.h"
#endif
-#include "gettextP.h"
+/* Handle multi-threaded applications. */
#ifdef _LIBC
#ifdef _LIBC
-/* We have to handle multi-threaded applications. */
# include <bits/libc-lock.h>
# include <bits/libc-lock.h>
+# define gl_rwlock_define __libc_rwlock_define
+# define gl_rwlock_wrlock __libc_rwlock_wrlock
+# define gl_rwlock_unlock __libc_rwlock_unlock
#else
#else
-/* Provide dummy implementation if this is outside glibc. */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
+# include "lock.h"
#endif
/* The internal variables in the standalone libintl.a must have different
names than the internal variables in GNU libc, otherwise programs
using libintl.a cannot be linked statically. */
#if !defined _LIBC
#endif
/* The internal variables in the standalone libintl.a must have different
names than the internal variables in GNU libc, otherwise programs
using libintl.a cannot be linked statically. */
#if !defined _LIBC
-# define _nl_default_default_domain
_nl_default_default_domain__
-# define _nl_current_default_domain
_nl_current_default_domain__
+# define _nl_default_default_domain
libintl_nl_default_default_domain
+# define _nl_current_default_domain
libintl_nl_current_default_domain
#endif
/* @@ end of prolog @@ */
/* Name of the default text domain. */
#endif
/* @@ end of prolog @@ */
/* Name of the default text domain. */
-extern const char _nl_default_default_domain[];
+extern const char _nl_default_default_domain[]
attribute_hidden
;
/* Default text domain in which entries for gettext(3) are to be found. */
/* Default text domain in which entries for gettext(3) are to be found. */
-extern const char *_nl_current_default_domain;
+extern const char *_nl_current_default_domain
attribute_hidden
;
/* Names for the libintl functions are a problem. They must not clash
/* Names for the libintl functions are a problem. They must not clash
@@
-67,18
+67,17
@@
extern const char *_nl_current_default_domain;
# define strdup(str) __strdup (str)
# endif
#else
# define strdup(str) __strdup (str)
# endif
#else
-# define TEXTDOMAIN
textdomain__
+# define TEXTDOMAIN
libintl_textdomain
#endif
/* Lock variable to protect the global data in the gettext implementation. */
#endif
/* Lock variable to protect the global data in the gettext implementation. */
-
__libc_rwlock_define (extern, _nl_state_lock
)
+
gl_rwlock_define (extern, _nl_state_lock attribute_hidden
)
/* Set the current default message catalog to DOMAINNAME.
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
char *
/* Set the current default message catalog to DOMAINNAME.
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
char *
-TEXTDOMAIN (domainname)
- const char *domainname;
+TEXTDOMAIN (const char *domainname)
{
char *new_domain;
char *old_domain;
{
char *new_domain;
char *old_domain;
@@
-87,7
+86,7
@@
TEXTDOMAIN (domainname)
if (domainname == NULL)
return (char *) _nl_current_default_domain;
if (domainname == NULL)
return (char *) _nl_current_default_domain;
-
__libc
_rwlock_wrlock (_nl_state_lock);
+
gl
_rwlock_wrlock (_nl_state_lock);
old_domain = (char *) _nl_current_default_domain;
old_domain = (char *) _nl_current_default_domain;
@@
-131,7
+130,7
@@
TEXTDOMAIN (domainname)
free (old_domain);
}
free (old_domain);
}
-
__libc
_rwlock_unlock (_nl_state_lock);
+
gl
_rwlock_unlock (_nl_state_lock);
return new_domain;
}
return new_domain;
}