X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=intl%2Fintl-compat.c;h=da890159f8029c9e5020bf7346c81144377eebb4;hb=7207868271d691528d3fff3a231d213622caa5c7;hp=36b7af0f83ba45a509229861895232cde048426d;hpb=2e0595dd8e344dbdcab740d7d2a3b67d153d6b39;p=pspp

diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index 36b7af0f83..da890159f8 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-2003 Software Foundation, Inc.
+   Copyright (C) 1995, 2000-2002 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,6 +21,8 @@
 # include <config.h>
 #endif
 
+#define _INTL_REDIRECT_MACROS
+#include "libgnuintl.h"
 #include "gettextP.h"
 
 /* @@ end of prolog @@ */
@@ -29,10 +31,7 @@
    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.
-   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).  */
+   has the redirections primarily in the <libintl.h> include file.  */
 
 
 #undef gettext
@@ -46,17 +45,6 @@
 #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;
@@ -65,7 +53,6 @@ gettext (msgid)
 }
 
 
-DLL_EXPORTED
 char *
 dgettext (domainname, msgid)
      const char *domainname;
@@ -75,7 +62,6 @@ dgettext (domainname, msgid)
 }
 
 
-DLL_EXPORTED
 char *
 dcgettext (domainname, msgid, category)
      const char *domainname;
@@ -86,7 +72,6 @@ dcgettext (domainname, msgid, category)
 }
 
 
-DLL_EXPORTED
 char *
 ngettext (msgid1, msgid2, n)
      const char *msgid1;
@@ -97,7 +82,6 @@ ngettext (msgid1, msgid2, n)
 }
 
 
-DLL_EXPORTED
 char *
 dngettext (domainname, msgid1, msgid2, n)
      const char *domainname;
@@ -109,7 +93,6 @@ dngettext (domainname, msgid1, msgid2, n)
 }
 
 
-DLL_EXPORTED
 char *
 dcngettext (domainname, msgid1, msgid2, n, category)
      const char *domainname;
@@ -122,7 +105,6 @@ dcngettext (domainname, msgid1, msgid2, n, category)
 }
 
 
-DLL_EXPORTED
 char *
 textdomain (domainname)
      const char *domainname;
@@ -131,7 +113,6 @@ textdomain (domainname)
 }
 
 
-DLL_EXPORTED
 char *
 bindtextdomain (domainname, dirname)
      const char *domainname;
@@ -141,7 +122,6 @@ bindtextdomain (domainname, dirname)
 }
 
 
-DLL_EXPORTED
 char *
 bind_textdomain_codeset (domainname, codeset)
      const char *domainname;