From 19f326e8ec1917f33e54e165e036f2c6ff091ce8 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 10 Feb 2012 17:30:47 +0100 Subject: [PATCH] re PR boehm-gc/48514 ([4.6] boehm gc incorrectly compile using __declspec(dllexport) on i686-w64-mingw32 target) 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: r184100 --- boehm-gc/ChangeLog | 7 +++++++ boehm-gc/include/gc_config_macros.h | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 22ea666ce5e1..e9d1eb5a6e8d 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,10 @@ +2012-02-10 Kai Tietz + + 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 * configure: Regenerate. diff --git a/boehm-gc/include/gc_config_macros.h b/boehm-gc/include/gc_config_macros.h index 0964784332bd..12e91e27f5e7 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