From 3f2c555d92fa34f2ece77fa05c7ccfb80fec3ab5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 1 Jun 2008 22:35:47 +0000
Subject: [PATCH] 2008-06-02 00:34 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)    * doc/whatsnew.txt      + Added some recent stuff.

   * contrib/xhb/hbcompat.ch
     + hb_FSize() <-> FileSize()

   * contrib/hbcurl/hbcurl.c
     ! Fixed typo.
---
 harbour/ChangeLog               | 10 ++++++++++
 harbour/contrib/hbcurl/hbcurl.c |  6 +++---
 harbour/contrib/xhb/hbcompat.ch |  2 ++
 harbour/doc/whatsnew.txt        |  7 +++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a3de424d80..0fed8f0b0f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-02 00:34 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * doc/whatsnew.txt
+     + Added some recent stuff.
+
+   * contrib/xhb/hbcompat.ch
+     + hb_FSize() <-> FileSize()
+
+   * contrib/hbcurl/hbcurl.c
+     ! Fixed typo.
+
 2008-06-01 23:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    * include/hbvm.h
    * source/vm/hvm.c
diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c
index b83bcf6a9b..070123d32f 100644
--- a/harbour/contrib/hbcurl/hbcurl.c
+++ b/harbour/contrib/hbcurl/hbcurl.c
@@ -67,7 +67,7 @@
 #include "hbcurl.ch"
 
 #define HB_CURL_OPT_BOOL( n )      ( ISLOG( n ) ? ( long ) hb_parl( n ) : hb_parnl( n ) )
-#define HB_CURL_OPT_BOOL_TRUE( n ) ( ISLOG( n ) ? ( long ) hb_parl( n ) : ( ISNUM( 1 ) ? hb_parnl( n ) : 1 ) )
+#define HB_CURL_OPT_BOOL_TRUE( n ) ( ISLOG( n ) ? ( long ) hb_parl( n ) : ( ISNUM( n ) ? hb_parnl( n ) : 1 ) )
 #ifdef HB_LONG_LONG_OFF
    #define HB_CURL_OPT_LARGEN( n ) ( ( curl_off_t ) hb_parnl( 3 ) ) /* TOFIX */
 #else
@@ -883,10 +883,10 @@ HB_FUNC( CURL_EASY_SETOPT )
          res = curl_easy_setopt( hb_curl->curl, CURLOPT_INFILESIZE_LARGE, HB_CURL_OPT_LARGEN( 3 ) );
          break;
       case HB_CURLOPT_UPLOAD:
-         res = curl_easy_setopt( hb_curl->curl, CURLOPT_UPLOAD, HB_CURL_OPT_BOOL_TRUE( 3 ) ? 1 : 0 );
+         res = curl_easy_setopt( hb_curl->curl, CURLOPT_UPLOAD, HB_CURL_OPT_BOOL_TRUE( 3 ) );
          break;
       case HB_CURLOPT_DOWNLOAD: /* Harbour extension */
-         res = curl_easy_setopt( hb_curl->curl, CURLOPT_UPLOAD, HB_CURL_OPT_BOOL_TRUE( 3 ) ? 0 : 1 );
+         res = curl_easy_setopt( hb_curl->curl, CURLOPT_UPLOAD, ! HB_CURL_OPT_BOOL_TRUE( 3 ) );
          break;
       case HB_CURLOPT_MAXFILESIZE:
          res = curl_easy_setopt( hb_curl->curl, CURLOPT_MAXFILESIZE, hb_parnl( 3 ) );
diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch
index 7f48769a6f..ce0fb56b18 100644
--- a/harbour/contrib/xhb/hbcompat.ch
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -86,6 +86,7 @@
    #xtranslate hb_rddInfo([<x,...>])   => rddInfo(<x>)
    #xtranslate hb_idleSleep([<x,...>]) => SecondsSleep(<x>)
    #xtranslate hb_UserName()           => NetName(1)
+   #xtranslate hb_FSize(<x>)           => FileSize(<x>)
 
    #xtranslate hb_HexToNum([<c,...>])  => HexToNum(<c>)
    #xtranslate hb_NumToHex([<n,...>])  => NumToHex(<n>)
@@ -148,6 +149,7 @@
    #xtranslate IsDirectory(<x>)        => hb_DirExists(<x>)
    #xtranslate SecondsSleep([<x,...>]) => hb_idleSleep(<x>)
    #xtranslate NetName(<n>)            => iif( ValType( <n> ) == "N" .AND. <n> == 1, hb_UserName(), NetName() )
+   #xtranslate FileSize(<x>)           => hb_FSize(<x>)
 
    #xtranslate HexToNum([<c,...>])     => hb_HexToNum(<c>)
    #xtranslate NumToHex([<n,...>])     => hb_NumToHex(<n>)
diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt
index 70a6c1896b..bbc39d5225 100644
--- a/harbour/doc/whatsnew.txt
+++ b/harbour/doc/whatsnew.txt
@@ -257,8 +257,11 @@ Contrib
 =============================
 - renamed contrib libraries
 - TIP library borrowed from xHarbour and adopted to Harbour
-- 
-- fixes in MYSQL and PGSQL library
+- added HBCURL - libcurl interface library. (rooted from the 
+  xHarbour version, but heavily fixed and further developed, 
+  not compatible in every respect.)
+- added HBSQLIT3 - SQLite 3.x Harbour callable library.
+- fixes in MySQL and PGSQL library
 - cleanup and many fixes in NF library
 - cleanup code of CT3 library with many modifications and fixes
 - most of in/out CT3 functions rewritten to use GT API so now they can work