diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f65c81ae54..183b7caf62 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-15 04:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbdefs.h
+    * modified PHB_FUNC/HB_FUNC_PTR declaration to use external 'extern "C"'
+      encapsulation for C++ compilers which do not accept it directly
+      (i.e. BORLAND or GCC 2.xx)
+
 2009-12-15 00:44 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbwin/win_regc.c
     * Minor cleanup to make code more robust.
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 16c3470a85..06924b5046 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -1615,13 +1615,10 @@ typedef unsigned char       HB_U8;
    #define HARBOUR void
 #endif
 
-#if defined( __BORLANDC__ )
+HB_EXTERN_BEGIN
    typedef HARBOUR ( * PHB_FUNC )( void );
    typedef PHB_FUNC HB_FUNC_PTR;
-#else
-   HB_EXTERN_C_ typedef HARBOUR ( * PHB_FUNC )( void );
-   HB_EXTERN_C_ typedef PHB_FUNC HB_FUNC_PTR;
-#endif
+HB_EXTERN_END
 
 typedef SHORT HB_SYMBOLSCOPE;   /* stores symbol's scope */