From c8155054ce63233eff4f179ae21c26e2da5a4eca Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 22 Dec 2009 09:53:11 +0000
Subject: [PATCH] 2009-12-22 10:51 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * package/winuni/RELNOTES     * Finalizing.

  * contrib/hbbtree/hb_btree.c
    ! Fixed typo in prev fix. (BTW only indicated by msvc64)
---
 harbour/ChangeLog                  |  7 +++++++
 harbour/contrib/hbbtree/hb_btree.c | 18 +++++++++---------
 harbour/package/winuni/RELNOTES    | 24 ++++++++++++++++--------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d63f16fb14..c1a48b3cb4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-22 10:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * package/winuni/RELNOTES
+    * Finalizing.
+
+  * contrib/hbbtree/hb_btree.c
+    ! Fixed typo in prev fix. (BTW only indicated by msvc64)
+
 2009-12-22 10:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * bin/postinst.prg
     ! Fixed typo. hbmk.cfg was not created because of this.
diff --git a/harbour/contrib/hbbtree/hb_btree.c b/harbour/contrib/hbbtree/hb_btree.c
index d5c78ff813..129e428ce6 100644
--- a/harbour/contrib/hbbtree/hb_btree.c
+++ b/harbour/contrib/hbbtree/hb_btree.c
@@ -604,17 +604,17 @@ static void HeaderWrite( struct hb_BTree * pBTree )
    hb_xmemset( TmpHeader, '\0', sizeof( TmpHeader ) );
 
    hb_xmemcpy( pHeader, HEADER_ID, sizeof( HEADER_ID ) - 1 ); pHeader += sizeof( HEADER_ID ) - 1;
-   HB_PUT_LE_UINT32( uiHeaderSize      , pHeader ); pHeader += 4;
-   HB_PUT_LE_UINT32( pBTree->usPageSize, pHeader ); pHeader += 4;
-   HB_PUT_LE_UINT32( pBTree->usKeySize , pHeader ); pHeader += 4;
-   HB_PUT_LE_UINT32( pBTree->usMaxKeys , pHeader ); pHeader += 4;
-   HB_PUT_LE_UINT32( pBTree->usMinKeys , pHeader ); pHeader += 4;
-   HB_PUT_LE_UINT32( pBTree->ulFlags   , pHeader );
+   HB_PUT_LE_UINT32( pHeader, uiHeaderSize       ); pHeader += 4;
+   HB_PUT_LE_UINT32( pHeader, ( UINT32 ) pBTree->usPageSize ); pHeader += 4;
+   HB_PUT_LE_UINT32( pHeader, ( UINT32 ) pBTree->usKeySize  ); pHeader += 4;
+   HB_PUT_LE_UINT32( pHeader, ( UINT32 ) pBTree->usMaxKeys  ); pHeader += 4;
+   HB_PUT_LE_UINT32( pHeader, ( UINT32 ) pBTree->usMinKeys  ); pHeader += 4;
+   HB_PUT_LE_UINT32( pHeader, pBTree->ulFlags    );
 
    pHeader = &TmpHeader[ 64 ];
-   HB_PUT_LE_UINT32( pBTree->ulRootPage, pHeader ); pHeader += 4;
-   HB_PUT_LE_UINT32( pBTree->ulFreePage, pHeader ); pHeader += 4;
-   HB_PUT_LE_UINT32( pBTree->ulKeyCount, pHeader );
+   HB_PUT_LE_UINT32( pHeader, pBTree->ulRootPage ); pHeader += 4;
+   HB_PUT_LE_UINT32( pHeader, pBTree->ulFreePage ); pHeader += 4;
+   HB_PUT_LE_UINT32( pHeader, pBTree->ulKeyCount );
 
    hb_fsSeek( pBTree->hFile, 0, FS_SET );
    if ( hb_fsWrite( pBTree->hFile, TmpHeader, sizeof( TmpHeader ) ) != sizeof( TmpHeader ) )
diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES
index cf2bfab599..afdd485f53 100644
--- a/harbour/package/winuni/RELNOTES
+++ b/harbour/package/winuni/RELNOTES
@@ -19,8 +19,8 @@ shared libs, MSVC and BCC x86 libs and examples.
 
 Options: x86 shared tools, x64 shared tools, MinGW x64 and
 WinCE-ARM libs, MSVC x64 libs, Open Watcom x86 libs,
-shared x64/WinCE-ARM libs, MS-DOS 32-bit DJGPP libs,
-OS/2 (watcom) libs, Linux (watcom) libs.
+shared x64/WinCE-ARM libs, MS-DOS (watcom), OS/2 (watcom) libs,
+Linux (watcom) libs.
 
 Usage:
 1) install/unpack to any directory (C:\hb20)
@@ -41,13 +41,12 @@ Tool/lib versions used to create this package:
    Compiler tools
    --------------
 
-   MinGW 4.4.1 TDM-2 (included)
-   MinGW w64 4.5.0-20091118
+   MinGW GNU C 4.4.1 TDM-2 (included)
+   MinGW w64 GNU C 4.5.0-20091118
    MinGW CEGCC 4.4.0
-   DJGPP 4.4.1 (2.04b1)
-   MSVC 2008 (bundled with MS Windows SDK 7)
-   Open Watcom C++ 1.8
-   Borland C++ 5.5.1
+   MSVC 2008 (version bundled with MS Windows SDK 7)
+   Open Watcom C 1.8
+   Borland C/C++ 5.5.1
 
    External lib dependencies
    -------------------------
@@ -69,9 +68,18 @@ Tool/lib versions used to create this package:
 Changes since previous (2.0.0beta3 20090905) release:
 -----------------------------------------------------------------------
 
+- Harbour updated to r13359 (from r12422)
+  (too many changes to list here)
 - MinGW CEGCC updated to 4.4.0
 - upx updated to 3.04.
 - MinGW 4.4.1 updated to TDM-2 release fixing a performance problem.
+- DJGPP build replaced with OpenWatcom MS-DOS build.
+- hbide (early development stage).
+- hbqt improvements.
+- hbwin full UNICODE support.
+- Rudimentary port of GTWVW (find it in examples)
+- new hbcairo wrapper for cairo lib.
+- improved code portability for startup code.
 
 Changes since previous (2.0.0beta2 20090624) release:
 -----------------------------------------------------------------------