re PR boehm-gc/48514 ([4.6] boehm gc incorrectly compile using __declspec(dllexport...

        PR boehm-gc/48514
        * include/gc_config_macros.h (GC_DLL): Define it for mingw-targets
        only, if we are actual in boehm-gc's build and DLL_EXPORT
        is defined.

From-SVN: r184101

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index f121804166a0ee825d944cdc743e013d65c76e1a..2115f1c1ad33dc2dffd65f6d68e5a3bd22f48b3b 100644 (file)
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-10  Kai Tietz  <ktietz@redhat.com>
+
+       PR boehm-gc/48514
+       * include/gc_config_macros.h (GC_DLL): Define it for mingw-targets
+       only, if we are actual in boehm-gc's build and DLL_EXPORT
+       is defined.
+
 2011-11-20  Andreas Tobler  <andreast@fgznet.ch>
 
        * configure: Regenerate.

diff --git a/boehm-gc/include/gc_config_macros.h b/boehm-gc/include/gc_config_macros.h
index 0964784332bdbff03b595fe4963d78c754c5242e..12e91e27f5e74d3970756484ceaea7ee15638fde 100644 (file)
--- a/boehm-gc/include/gc_config_macros.h
+++ b/boehm-gc/include/gc_config_macros.h
@@ -81,7 +81,9 @@
     typedef long ptrdiff_t;    /* ptrdiff_t is not defined */
 # endif
 
-#if defined(_DLL) && !defined(GC_NOT_DLL) && !defined(GC_DLL)
+#if ((defined(_DLL) && !defined (__MINGW32__)) \
+     || (defined (DLL_EXPORT) && defined (GC_BUILD))) \
+    && !defined(GC_DLL)
 # define GC_DLL
 #endif