diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5ed83af1ac..c2204f34d7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-08 11:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbmath.h
+    ! fixed C++ DJGPP builds
+
 2009-07-08 11:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/xhb/xhbat.c
   * contrib/hbtip/utils.c
diff --git a/harbour/include/hbmath.h b/harbour/include/hbmath.h
index 53b4fcbea6..4ea0eb9dd6 100644
--- a/harbour/include/hbmath.h
+++ b/harbour/include/hbmath.h
@@ -93,7 +93,9 @@ HB_EXTERN_BEGIN
    #define matherr _matherr
    #define exception _exception
 #elif defined(__DJGPP__)
-   #define HB_MATH_HANDLER
+   #ifndef __cplusplus
+      #define HB_MATH_HANDLER
+   #endif
 #elif defined( HB_OS_WIN_CE ) && defined( __POCC__ )
    /* NOTE: Workaround for Pellec C 5.00 not having an 'inf' (HUGE_VAL) 
             in '-Tarm-coff' mode. [vszakats] */