From 3b55cf37fd62739be169fdb2df9f1caf0f5d07c4 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Fri, 23 Oct 2009 10:11:35 +0000
Subject: [PATCH] 2009-10-23 12:11 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/src/vm/fm.c     * enable USE_DL_PREFIX
 in all C++ builds to avoid conflicts with       different exception
 declarations for standard memory functions       in C++ header files

---
 harbour/ChangeLog   | 6 ++++++
 harbour/src/vm/fm.c | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7a7a1f4e9c..07b3eb9302 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-23 12:11 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/vm/fm.c
+    * enable USE_DL_PREFIX in all C++ builds to avoid conflicts with
+      different exception declarations for standard memory functions
+      in C++ header files
+
 2009-10-23 11:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbapi.h
   * harbour/src/vm/extend.c
diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c
index 22edc7f6da..51a83f90e8 100644
--- a/harbour/src/vm/fm.c
+++ b/harbour/src/vm/fm.c
@@ -155,9 +155,6 @@
 #     pragma warn -ngu
 #     pragma warn -prc
 #     pragma warn -rch
-#     if defined( __cplusplus ) && ! defined( USE_DL_PREFIX )
-#        define USE_DL_PREFIX
-#     endif
 #  elif defined( HB_OS_WIN_CE ) && defined( __POCC__ )
 #     define ABORT TerminateProcess( GetCurrentProcess(), 0 )
 #  elif defined( __POCC__ ) && !defined( InterlockedCompareExchangePointer )
@@ -178,6 +175,9 @@
 #        define LACKS_FCNTL_H
 #     endif
 #  endif
+#  if defined( __cplusplus ) && ! defined( USE_DL_PREFIX )
+#     define USE_DL_PREFIX
+#  endif
 #  include "dlmalloc.c"
 #  if defined( __BORLANDC__ )
 #     pragma warn +aus