diff options
Diffstat (limited to 'intl/intl-compat.c')
| -rw-r--r-- | intl/intl-compat.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/intl/intl-compat.c b/intl/intl-compat.c index da890159..36b7af0f 100644 --- a/intl/intl-compat.c +++ b/intl/intl-compat.c @@ -1,6 +1,6 @@ /* intl-compat.c - Stub functions to call gettext functions from GNU gettext Library. - Copyright (C) 1995, 2000-2002 Software Foundation, Inc. + Copyright (C) 1995, 2000-2003 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 @@ -21,8 +21,6 @@ # include <config.h> #endif -#define _INTL_REDIRECT_MACROS -#include "libgnuintl.h" #include "gettextP.h" /* @@ end of prolog @@ */ @@ -31,7 +29,10 @@ defined in the included GNU libintl library (with "libintl_" prefix). It is compiled into libintl in order to make the AM_GNU_GETTEXT test of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which - has the redirections primarily in the <libintl.h> include file. */ + has the redirections primarily in the <libintl.h> include file. + It is also compiled into libgnuintl so that libgnuintl.so can be used + as LD_PRELOADable library on glibc systems, to provide the extra + features that the functions in the libc don't have (namely, logging). */ #undef gettext @@ -45,6 +46,17 @@ #undef bind_textdomain_codeset +/* When building a DLL, we must export some functions. Note that because + the functions are only defined for binary backward compatibility, we + don't need to use __declspec(dllimport) in any case. */ +#if defined _MSC_VER && BUILDING_DLL +# define DLL_EXPORTED __declspec(dllexport) +#else +# define DLL_EXPORTED +#endif + + +DLL_EXPORTED char * gettext (msgid) const char *msgid; @@ -53,6 +65,7 @@ gettext (msgid) } +DLL_EXPORTED char * dgettext (domainname, msgid) const char *domainname; @@ -62,6 +75,7 @@ dgettext (domainname, msgid) } +DLL_EXPORTED char * dcgettext (domainname, msgid, category) const char *domainname; @@ -72,6 +86,7 @@ dcgettext (domainname, msgid, category) } +DLL_EXPORTED char * ngettext (msgid1, msgid2, n) const char *msgid1; @@ -82,6 +97,7 @@ ngettext (msgid1, msgid2, n) } +DLL_EXPORTED char * dngettext (domainname, msgid1, msgid2, n) const char *domainname; @@ -93,6 +109,7 @@ dngettext (domainname, msgid1, msgid2, n) } +DLL_EXPORTED char * dcngettext (domainname, msgid1, msgid2, n, category) const char *domainname; @@ -105,6 +122,7 @@ dcngettext (domainname, msgid1, msgid2, n, category) } +DLL_EXPORTED char * textdomain (domainname) const char *domainname; @@ -113,6 +131,7 @@ textdomain (domainname) } +DLL_EXPORTED char * bindtextdomain (domainname, dirname) const char *domainname; @@ -122,6 +141,7 @@ bindtextdomain (domainname, dirname) } +DLL_EXPORTED char * bind_textdomain_codeset (domainname, codeset) const char *domainname; |