From: Bruno Haible <bruno@clisp.org>
Date: Sun, 16 Sep 2018 22:11:08 +0000 (+0200)
Subject: Fix link error on Cygwin.
X-Git-Tag: v0.20~382
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98f9fe5ef3cdf711f49f28978ea8aaacd0dfdebd;p=thirdparty%2Fgettext.git

Fix link error on Cygwin.

Patch partially by Michael Haubenwallner at
https://gitlab.gnome.org/GNOME/libxml2/commit/c65c9e8ee07e2dab0647392c2bd1795a5bc99829

* gnulib-local/lib/libxml/xmlexports.in.h: Don't assume that _WIN32 is defined
on Cygwin.
(XMLPUBVAR): Define as 'extern', not as empty.
---

diff --git a/gnulib-local/lib/libxml/xmlexports.in.h b/gnulib-local/lib/libxml/xmlexports.in.h
index 2c79f814b..31ab8a10a 100644
--- a/gnulib-local/lib/libxml/xmlexports.in.h
+++ b/gnulib-local/lib/libxml/xmlexports.in.h
@@ -131,8 +131,8 @@
   #endif
 #endif
 
-/* Cygwin platform, GNU compiler */
-#if defined(_WIN32) && defined(__CYGWIN__)
+/* Cygwin platform (does not define _WIN32), GNU compiler */
+#if defined(__CYGWIN__)
   #undef XMLPUBFUN
   #undef XMLPUBVAR
   #undef XMLCALL
@@ -145,7 +145,7 @@
     #if !defined(LIBXML_STATIC)
       #define XMLPUBVAR __declspec(dllimport) extern
     #else
-      #define XMLPUBVAR
+      #define XMLPUBVAR extern
     #endif
   #endif
   #define XMLCALL __cdecl