diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 933fb79069..d6de1727b4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-10-22 14:29 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/vm/fm.c
+    * added workaround for some compiler which defines FORCEINLINE
+      macro with 'extern' keyword (i.e. some MinGW versions).
+
+  * harbour/contrib/rddads/rddads.h
+    * added workaround for some MinGW versions which do not understand
+      _declspec() but only __declspec()
+
 2010-10-22 11:24 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/gtwvt/gtwvt.c
     ! use ERROR_CLASS_ALREADY_EXISTS instead of hardcoded 1410 value
diff --git a/harbour/contrib/rddads/rddads.h b/harbour/contrib/rddads/rddads.h
index 224977b21c..5d95122e39 100644
--- a/harbour/contrib/rddads/rddads.h
+++ b/harbour/contrib/rddads/rddads.h
@@ -65,7 +65,7 @@
 #if !defined( x64 ) && defined( HB_ARCH_64BIT )
    #define x64
 #endif
-#if defined( __WATCOMC__ ) || defined( __LCC__ )
+#if defined( __WATCOMC__ ) || defined( __LCC__ ) || defined( __MINGW32__ )
    #define _declspec( dllexport ) __declspec( dllexport )
 #endif
 
diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c
index 35536f23a0..aae4a3a8a6 100644
--- a/harbour/src/vm/fm.c
+++ b/harbour/src/vm/fm.c
@@ -139,6 +139,7 @@
 /* #  define NO_MALLINFO 1 */
 /* #  define INSECURE */
 /* #  define USE_DL_PREFIX */
+#  undef FORCEINLINE
 #  if !defined( FORCEINLINE )
 #     define FORCEINLINE HB_FORCEINLINE
 #  endif