From 8b846abb6bfa653e8c6fc24833974824b30b3f8d Mon Sep 17 00:00:00 2001
From: Mindaugas Kavaliauskas <dbtopas@dbtopas.lt>
Date: Tue, 13 Jan 2009 18:05:52 +0000
Subject: [PATCH] 2009-01-13 20:00 UTC+0200 Mindaugas Kavaliauskas
 (dbtopas/at/dbtopas.lt)   * harbour/contrib/rddads/adsx.c     * improved code
 to solve RDD initialisation order problem   *
 harbour/contrib/rddsql/sqlbase.c     ! fixed minor typo   *
 harbour/source/pp/hbpp.c   * harbour/source/compiler/hbusage.c     * updated
 copyright year to 2009

---
 harbour/ChangeLog                 |  9 +++++++++
 harbour/contrib/rddads/adsx.c     | 11 ++++++++++-
 harbour/contrib/rddsql/sqlbase.c  |  2 +-
 harbour/source/compiler/hbusage.c |  2 +-
 harbour/source/pp/hbpp.c          |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 34cb231ea4..83d640991c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-01-13 20:00 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
+  * harbour/contrib/rddads/adsx.c
+    * improved code to solve RDD initialisation order problem
+  * harbour/contrib/rddsql/sqlbase.c
+    ! fixed minor typo
+  * harbour/source/pp/hbpp.c
+  * harbour/source/compiler/hbusage.c
+    * updated copyright year to 2009 
+
 2009-01-13 07:17 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/gtwvg/gtwvg.c
     ! Synchronized with GTWVT as per change below ( Przemek ):
diff --git a/harbour/contrib/rddads/adsx.c b/harbour/contrib/rddads/adsx.c
index 0a9c018916..9ffb1900bc 100644
--- a/harbour/contrib/rddads/adsx.c
+++ b/harbour/contrib/rddads/adsx.c
@@ -1549,13 +1549,22 @@ HB_FUNC( ADSX ) { ; }
    #define HB_PRG_PCODE_VER HB_PCODE_VER
 #endif
 
+HB_FUNC_EXTERN( ADS );
+
 static void hb_adsxRddInit( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
 
    if( hb_rddRegister( "ADSX", RDT_FULL ) > 1 )
    {
-      hb_errInternal( HB_EI_RDDINVALID, NULL, NULL, NULL );
+      /* try different RDD registrer order */
+      hb_rddRegister( "ADS", RDT_FULL );
+
+      if ( hb_rddRegister( "ADSX", RDT_FULL ) > 1 )
+      {
+         hb_errInternal( HB_EI_RDDINVALID, NULL, NULL, NULL );
+         HB_FUNC_EXEC( ADS );   /* force ADS linking */
+      }
    }
 }
 
diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c
index c0b6391c4d..87c785ae9e 100644
--- a/harbour/contrib/rddsql/sqlbase.c
+++ b/harbour/contrib/rddsql/sqlbase.c
@@ -648,7 +648,7 @@ static ERRCODE sqlbaseOpen( SQLBASEAREAP pArea, LPDBOPENINFO pOpenInfo )
    /* filename is a query */
    pArea->szQuery = (char*) hb_strdup( (char*) pOpenInfo->abName );
 
-   if ( ! pArea->uiFieldCount ) 
+   if ( pArea->uiFieldCount ) 
       /* This should not happen (in __dbTrans()), because RDD is registered with RDT_FULL */
       return FAILURE; 
 
diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c
index dad6746fb5..b1d54b4d29 100644
--- a/harbour/source/compiler/hbusage.c
+++ b/harbour/source/compiler/hbusage.c
@@ -258,6 +258,6 @@ void hb_compPrintLogo( HB_COMP_DECL )
 
    hb_compOutStd( HB_COMP_PARAM, szVer );
    hb_compOutStd( HB_COMP_PARAM,
-                  "\nCopyright (c) 1999-2008, http://www.harbour-project.org/\n" );
+                  "\nCopyright (c) 1999-2009, http://www.harbour-project.org/\n" );
    hb_xfree( szVer );
 }
diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c
index 4ef4e8e32b..e65b98608f 100644
--- a/harbour/source/pp/hbpp.c
+++ b/harbour/source/pp/hbpp.c
@@ -586,7 +586,7 @@ int main( int argc, char * argv[] )
 
    printf( "Harbour Preprocessor %d.%d.%d\n",
       HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE );
-   printf( "Copyright (c) 1999-2008, http://www.harbour-project.org/\n" );
+   printf( "Copyright (c) 1999-2009, http://www.harbour-project.org/\n" );
 
    pState = hb_pp_new();