diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c0077390d9..d34a114576 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-01-15 10:31 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbdefs.h
+    ! do not define [U]LONGLONG when HB_DONT_DEFINE_BASIC_TYPES macro
+      is set
+
 2008-01-15 10:21 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rdd/usrrdd/usrrdd.c
     * added missing 'const' to few variable declarations
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 22bdb05b80..bc9d724968 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -218,7 +218,7 @@
 
 #ifndef HB_LONG_LONG_OFF
 
-   #if ! defined(_WINNT_H)
+   #if ! defined(HB_DONT_DEFINE_BASIC_TYPES) && ! defined(_WINNT_H)
       #if !defined(LONGLONG)
          #if defined(__GNUC__)
             typedef long long LONGLONG;