From 43216a289d2408fdb5fc04254304cc5f64cb59af Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 27 Sep 2012 14:08:49 +0000
Subject: [PATCH] 2012-09-27 16:01 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/rddads/rddads.h     ! fixed version detection for ADS 6.00 and
 6.10/6.11       Thanks to jb for providing the header file.

  * contrib/rddads/ads1.c
    ! fixed for ADS 6.00

  * contrib/rddads/adsfunc.c
    ! fixed for ADS older than 6.00
---
 harbour/ChangeLog                | 11 +++++++++++
 harbour/contrib/rddads/ads1.c    |  4 ++--
 harbour/contrib/rddads/adsfunc.c |  2 ++
 harbour/contrib/rddads/rddads.h  |  4 +++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f70573e252..bcc8ed546d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-27 16:01 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/rddads/rddads.h
+    ! fixed version detection for ADS 6.00 and 6.10/6.11
+      Thanks to jb for providing the header file.
+
+  * contrib/rddads/ads1.c
+    ! fixed for ADS 6.00
+
+  * contrib/rddads/adsfunc.c
+    ! fixed for ADS older than 6.00
+
 2012-09-27 15:31 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/gtwvg/combobox.prg
   * contrib/gtwvg/listbox.prg
diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c
index 2649237add..20ca575579 100644
--- a/harbour/contrib/rddads/ads1.c
+++ b/harbour/contrib/rddads/ads1.c
@@ -2113,7 +2113,7 @@ static HB_ERRCODE adsFlush( ADSAREAP pArea )
    if( !pArea->fReadonly )
    {
       AdsWriteRecord( pArea->hTable );
-#if ADS_LIB_VERSION >= 600
+#if ADS_LIB_VERSION >= 610
       if( hb_setGetL( HB_SET_HARDCOMMIT ) )
          AdsFlushFileBuffers( pArea->hTable );
 #endif
@@ -3966,7 +3966,7 @@ static HB_ERRCODE adsOrderListClear( ADSAREAP pArea )
 {
    HB_TRACE(HB_TR_DEBUG, ("adsOrderListClear(%p)", pArea));
 
-#if ADS_LIB_VERSION >= 600
+#if ADS_LIB_VERSION >= 610
    if( !pArea->fReadonly )
       AdsFlushFileBuffers( pArea->hTable );  /* meaningful with local server; ignored by remote server */
 #endif
diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c
index c642fd19f8..76bf8c2212 100644
--- a/harbour/contrib/rddads/adsfunc.c
+++ b/harbour/contrib/rddads/adsfunc.c
@@ -1986,10 +1986,12 @@ HB_FUNC( ADSDDSETDATABASEPROPERTY )
       }
 #endif
       /* Boolean properties */
+#if ADS_LIB_VERSION >= 600
       case ADS_DD_LOG_IN_REQUIRED:
       case ADS_DD_VERIFY_ACCESS_RIGHTS:
       case ADS_DD_ENCRYPT_NEW_TABLE:
       case ADS_DD_ENABLE_INTERNET:
+#endif
 #if ADS_LIB_VERSION >= 710
       case ADS_DD_LOGINS_DISABLED:
 #endif
diff --git a/harbour/contrib/rddads/rddads.h b/harbour/contrib/rddads/rddads.h
index b78c9cd571..423b6ce41e 100644
--- a/harbour/contrib/rddads/rddads.h
+++ b/harbour/contrib/rddads/rddads.h
@@ -92,8 +92,10 @@
    #define _ADS_LIB_VERSION 700
 #elif defined( ADS_COMPRESS_ALWAYS )
    #define _ADS_LIB_VERSION 620
+#elif defined( ADS_READ_ALL_COLUMNS )
+   #define _ADS_LIB_VERSION 610
 #elif defined( ADS_USER_DEFINED )
-   #define _ADS_LIB_VERSION 611
+   #define _ADS_LIB_VERSION 600
 #else
    #define _ADS_LIB_VERSION 500
 #endif