]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
Fix link error on Cygwin.
authorBruno Haible <bruno@clisp.org>
Sun, 16 Sep 2018 22:11:08 +0000 (00:11 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 16 Sep 2018 23:39:11 +0000 (01:39 +0200)
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.

gnulib-local/lib/libxml/xmlexports.in.h

index 2c79f814b45c767eb2f69a126a38354cfb08ec3f..31ab8a10abdf809b74534536033fab193ff58b3a 100644 (file)
   #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
     #if !defined(LIBXML_STATIC)
       #define XMLPUBVAR __declspec(dllimport) extern
     #else
-      #define XMLPUBVAR
+      #define XMLPUBVAR extern
     #endif
   #endif
   #define XMLCALL __cdecl