diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 933fa1fe0a..961eba0163 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-27 23:06 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbmxml/3rd/minixml/config.h
+    ! deleted macro redefinition to silence MSVC warning
+    ! fixed built-time error with some missing internal helper
+      functions in C++ mode (f.e. MSVC)
+      Thanks to Ronaldo M++ for report.
+
 2012-09-27 18:32 UTC+0200 Viktor Szakats (vszakats syenar.net)
   + contrib/hbexpat/tests/test.xml
   * contrib/hbexpat/tests/test.prg
diff --git a/harbour/contrib/hbmxml/3rd/minixml/config.h b/harbour/contrib/hbmxml/3rd/minixml/config.h
index 903a2de1bb..b069b6bd17 100644
--- a/harbour/contrib/hbmxml/3rd/minixml/config.h
+++ b/harbour/contrib/hbmxml/3rd/minixml/config.h
@@ -39,9 +39,9 @@
 #define close      _close
 #define open       _open
 #define read       _read
-#define snprintf   _snprintf
+/* #define snprintf   _snprintf */
 #define strdup     _strdup
-#define vsnprintf  _vsnprintf
+/* #define vsnprintf  _vsnprintf */
 #define write      _write
 #endif
 
@@ -94,6 +94,10 @@
  * Define prototypes for string functions as needed...
  */
 
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
 #  ifndef HAVE_STRDUP
 extern char	*_mxml_strdup(const char *);
 #    if defined( strdup )
@@ -120,3 +124,7 @@ extern int	_mxml_vsnprintf(char *, size_t, const char *, va_list);
 #    endif
 #    define vsnprintf _mxml_vsnprintf
 #  endif /* !HAVE_VSNPRINTF */
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */