summaryrefslogtreecommitdiff
path: root/boehm-gc
diff options
context:
space:
mode:
authorktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>2012-02-10 16:30:47 +0000
committerktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>2012-02-10 16:30:47 +0000
commit780036324bb35cec03dad4e4606fc37254108a2c (patch)
treed52fbfb9f2b56772c08560f036ffa4aa8eed220d /boehm-gc
parentee29ae309e17ce727ea0dc120d254b42d37c9dc3 (diff)
downloadgcc-780036324bb35cec03dad4e4606fc37254108a2c.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184100 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
-rw-r--r--boehm-gc/ChangeLog7
-rw-r--r--boehm-gc/include/gc_config_macros.h4
2 files changed, 10 insertions, 1 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 22ea666ce5e..e9d1eb5a6e8 100644
--- 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-21 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 0964784332b..12e91e27f5e 100644
--- 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