Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / intl / intl-compat.c

diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index 43d45174e17f41ba4997be4e4bd4f028c42e6fd5..96f9d955d114667dde9c6285f46d9717dffc582e 100644 (file)
--- 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-2003, 2005 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
@@ -14,7 +14,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
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
@@ -49,9 +49,7 @@
 /* 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 HAVE_VISIBILITY && BUILDING_DLL
-# define DLL_EXPORTED __attribute__((__visibility__("default")))
-#elif defined _MSC_VER && BUILDING_DLL
+#if defined _MSC_VER && BUILDING_DLL
 # define DLL_EXPORTED __declspec(dllexport)
 #else
 # define DLL_EXPORTED
@@ -93,7 +91,7 @@ ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
 DLL_EXPORTED
 char *
 dngettext (const char *domainname,
-           const char *msgid1, const char *msgid2, unsigned long int n)
+          const char *msgid1, const char *msgid2, unsigned long int n)
 {
   return libintl_dngettext (domainname, msgid1, msgid2, n);
 }
@@ -102,8 +100,8 @@ dngettext (const char *domainname,
 DLL_EXPORTED
 char *
 dcngettext (const char *domainname,
-            const char *msgid1, const char *msgid2, unsigned long int n,
-            int category)
+           const char *msgid1, const char *msgid2, unsigned long int n,
+           int category)
 {
   return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
 }