diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9f339afee5..f8c89e5b08 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-17 12:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbodbc/odbc.c
+    - Deleted compatibility trick which mapped SQL[U]LEN to SQL[U]INTEGER.
+      The trick is most likely not needed anymore, they were first
+      introduced in 2007-01-24 10:25 UTC+0100 Przemyslaw Czerpak with
+      the description 'synced with xhb', next it was extended with the
+      "U" version in 2008-08-13 03:08 UTC+0200 Viktor Szakats, for
+      __DMC__ compatibility. We dropped DMC support since.
+    ; Tamas can you pls retest if this fixed the Linux AMD64 build
+      error in C++ mode?
+
+  * src/rtl/gtsys.c
+    * Made GTCGI the default GT for VxWorks. (GTSTD doesn't work now)
+
 2010-07-17 11:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     % Won't anymore do dependency check on system headers found on
@@ -154,10 +168,9 @@
 
           Obviously I made few functional tests, but from the experiences
           of the port effort, these are the remaining areas:
-             - reporting bug(s) to Wind River (particularly the one
-               breaking hvm.c compilation, requiring HB_LONG_LONG_OFF
-               forcage, causing other unnecessary limits and hbtest
-               failures)
+             - reporting compiler bug to Wind River (the one breaking
+               hvm.c compilation, requiring HB_LONG_LONG_OFF forcage,
+               causing other unnecessary limits and hbtest failures)
              - serial I/O needs to be implemented using VxWorks specific
                sioLib API
              - 'fork' has to be replaced.
@@ -181,7 +194,8 @@
                build makes it work (or setup Workbench to launch
                win-make.exe?). [CLOSED]
              - Maybet the dbCreate() problem worth looking into, as f.e.
-               hb_out.log was generated fine on the FS.
+               hb_out.log and _hbtmp_.dbf were both created fine on the FS,
+               but the latter stayed to be a zero length file.
 
 2010-07-16 09:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idebrowse.prg
diff --git a/harbour/contrib/hbodbc/odbc.c b/harbour/contrib/hbodbc/odbc.c
index 56850a1e3d..d8034ec314 100644
--- a/harbour/contrib/hbodbc/odbc.c
+++ b/harbour/contrib/hbodbc/odbc.c
@@ -95,12 +95,6 @@
 #  if !defined( SQLLEN ) && !defined( SQLTCHAR )
       typedef unsigned char   SQLTCHAR;
 #  endif
-#  if !defined( SQLLEN )
-#     define SQLLEN           SQLINTEGER
-#  endif
-#  if !defined( SQLULEN )
-#     define SQLULEN          SQLUINTEGER
-#  endif
 #endif
 
 #ifndef SQL_NO_DATA
diff --git a/harbour/src/rtl/gtsys.c b/harbour/src/rtl/gtsys.c
index a97f7e5f5c..6ca3e474cd 100644
--- a/harbour/src/rtl/gtsys.c
+++ b/harbour/src/rtl/gtsys.c
@@ -70,7 +70,7 @@
 #elif defined( HB_OS_OS2 )
    HB_GT_REQUEST( OS2 )
 #elif defined( HB_OS_VXWORKS )
-   HB_GT_REQUEST( STD )
+   HB_GT_REQUEST( CGI )
 #elif defined( HB_OS_UNIX )
    HB_GT_REQUEST( TRM )
 #else