From d976db49c911c3f94df93ed469176ebf588ae470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Thu, 26 Feb 2015 09:37:00 +0100
Subject: [PATCH] 2015-02-26 09:36 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * contrib/rddads/ads1.c     * removed
 unnecessary casting

  * contrib/rddads/adsx.c
    ! fixed to work with ACE < 6.1
---
 ChangeLog.txt         |  7 +++++++
 contrib/rddads/ads1.c | 11 ++++++-----
 contrib/rddads/adsx.c | 19 ++++++++++++++-----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2ac7de07f7..0bd075c215 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-02-26 09:36 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/rddads/ads1.c
+    * removed unnecessary casting
+
+  * contrib/rddads/adsx.c
+    ! fixed to work with ACE < 6.1
+
 2015-02-25 22:06 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbodbc/odbc.c
   * contrib/hbodbc/sql.ch
diff --git a/contrib/rddads/ads1.c b/contrib/rddads/ads1.c
index 4f3863ef78..3c22008d82 100644
--- a/contrib/rddads/ads1.c
+++ b/contrib/rddads/ads1.c
@@ -4205,8 +4205,8 @@ static HB_ERRCODE adsOrderCreate( ADSAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
                                  ( UNSIGNED8 * ) pOrderInfo->abBagName,
                                  ( UNSIGNED8 * ) pOrderInfo->atomBagName,
                                  ( UNSIGNED8 * ) hb_itemGetCPtr( pExprItem ),
-                                 ( pArea->area.lpdbOrdCondInfo && pArea->area.lpdbOrdCondInfo->abFor ) ?
-                                 ( UNSIGNED8 * ) pArea->area.lpdbOrdCondInfo->abFor : ( UNSIGNED8 * ) "",
+                                 pArea->area.lpdbOrdCondInfo ?
+                                    ( UNSIGNED8 * ) pArea->area.lpdbOrdCondInfo->abFor : NULL,
                                  pucWhile, u32Options,
                                  adsGetFileType( pArea->area.rddID ) == ADS_ADT ? adsIndexPageSize( ADS_ADT ) : ADS_DEFAULT,
                                  &hIndex );
@@ -4215,9 +4215,10 @@ static HB_ERRCODE adsOrderCreate( ADSAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
                                ( UNSIGNED8 * ) pOrderInfo->abBagName,
                                ( UNSIGNED8 * ) pOrderInfo->atomBagName,
                                ( UNSIGNED8 * ) hb_itemGetCPtr( pExprItem ),
-                               ( pArea->area.lpdbOrdCondInfo && pArea->area.lpdbOrdCondInfo->abFor ) ?
-                               ( UNSIGNED8 * ) pArea->area.lpdbOrdCondInfo->abFor : ( UNSIGNED8 * ) "",
-                               pucWhile, u32Options, &hIndex );
+                               pArea->area.lpdbOrdCondInfo ?
+                                 ( UNSIGNED8 * ) pArea->area.lpdbOrdCondInfo->abFor : NULL,
+                               pucWhile, u32Options,
+                               &hIndex );
 #endif
 
    SELF_ORDSETCOND( &pArea->area, NULL );
diff --git a/contrib/rddads/adsx.c b/contrib/rddads/adsx.c
index 7feb6427e8..326ef52613 100644
--- a/contrib/rddads/adsx.c
+++ b/contrib/rddads/adsx.c
@@ -1138,20 +1138,29 @@ static HB_ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderIn
       UNSIGNED16 usLen = sizeof( szKeyExpr );
 
       if( pArea->adsarea.area.lpdbOrdCondInfo->fUseCurrent && pArea->adsarea.hOrdCurrent )
-      {
          AdsGetIndexExpr( pArea->adsarea.hOrdCurrent, szKeyExpr, &usLen );
-      }
       else
          szKeyExpr[ 0 ] = '\0';
 
+#if ADS_LIB_VERSION >= 610
       u32RetVal = AdsCreateIndex61(
          pArea->adsarea.area.lpdbOrdCondInfo->fUseCurrent ? pArea->adsarea.hOrdCurrent : pArea->adsarea.hTable,
          ( UNSIGNED8 * ) pOrderInfo->abBagName,
          ( UNSIGNED8 * ) pOrderInfo->atomBagName,
-         szKeyExpr[ 0 ] ? ( UNSIGNED8 * ) szKeyExpr : ( UNSIGNED8 * ) "1",
-         ( UNSIGNED8 * ) ( ( bForADS && pArea->adsarea.area.lpdbOrdCondInfo->abFor ) ? pArea->adsarea.area.lpdbOrdCondInfo->abFor : NULL ),
-         ( UNSIGNED8 * ) ( ( bWhileADS && pArea->adsarea.area.lpdbOrdCondInfo->abWhile ) ? pArea->adsarea.area.lpdbOrdCondInfo->abWhile : NULL ),
+         szKeyExpr[ 0 ] ? szKeyExpr : ( UNSIGNED8 * ) "1",
+         bForADS ? ( UNSIGNED8 * ) pArea->adsarea.area.lpdbOrdCondInfo->abFor : NULL,
+         bWhileADS ? ( UNSIGNED8 * ) pArea->adsarea.area.lpdbOrdCondInfo->abWhile : NULL,
          ADS_COMPOUND, ADS_DEFAULT, &hIndex );
+#else
+      u32RetVal = AdsCreateIndex(
+         pArea->adsarea.area.lpdbOrdCondInfo->fUseCurrent ? pArea->adsarea.hOrdCurrent : pArea->adsarea.hTable,
+         ( UNSIGNED8 * ) pOrderInfo->abBagName,
+         ( UNSIGNED8 * ) pOrderInfo->atomBagName,
+         szKeyExpr[ 0 ] ? szKeyExpr : ( UNSIGNED8 * ) "1",
+         bForADS ? ( UNSIGNED8 * ) pArea->adsarea.area.lpdbOrdCondInfo->abFor : NULL,
+         bWhileADS ? ( UNSIGNED8 * ) pArea->adsarea.area.lpdbOrdCondInfo->abWhile : NULL,
+         ADS_COMPOUND, &hIndex );
+#endif
 
       if( u32RetVal != AE_SUCCESS )
       {