From 5c75adefe2afed8cbf9ae5584f311d36f3dc124d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 29 Nov 2012 13:41:03 +0000
Subject: [PATCH] 2012-11-29 14:39 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/rddads/tests/datad.prg   * contrib/rddads/tests/testmg.prg     *
 cleanup to script rdd registration code from yesterday

---
 harbour/ChangeLog.txt                   | 5 +++++
 harbour/contrib/rddads/tests/datad.prg  | 6 ++----
 harbour/contrib/rddads/tests/testmg.prg | 6 ++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 2f77213654..7f0cf123bf 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,11 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-29 14:39 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/rddads/tests/datad.prg
+  * contrib/rddads/tests/testmg.prg
+    * cleanup to script rdd registration code from yesterday
+
 2012-11-29 13:54 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hblzf/tests/hbmk.hbm
   * contrib/hblzf/tests/test.prg
diff --git a/harbour/contrib/rddads/tests/datad.prg b/harbour/contrib/rddads/tests/datad.prg
index fa473ac2f7..e89f8d80a8 100644
--- a/harbour/contrib/rddads/tests/datad.prg
+++ b/harbour/contrib/rddads/tests/datad.prg
@@ -21,16 +21,14 @@ PROCEDURE Main()
    LOCAL aStru := { { "ID", "A", 1, 0 }, { "Name", "C", 50, 0 }, { "address", "C", 50, 0 }, { "city", "C", 30, 0 }, { "Age", "n", 3, 0 } }
    LOCAL hConnection1
 
-#if defined( __HBSCRIPT__HBSHELL )
-   rddRegister( "ADSADT" )
-#endif
-
 #if defined( __HBDYNLOAD__RDDADS__ )
    LOCAL l := hb_libLoad( hb_libName( "rddads" + hb_libPostfix() ) )
 
    hb_rddADSRegister()
 
    HB_SYMBOL_UNUSED( l )
+#elif defined( __HBSCRIPT__HBSHELL )
+   hb_rddADSRegister()
 #endif
 
    CLS
diff --git a/harbour/contrib/rddads/tests/testmg.prg b/harbour/contrib/rddads/tests/testmg.prg
index 69ef51ed7d..aa9a51c404 100644
--- a/harbour/contrib/rddads/tests/testmg.prg
+++ b/harbour/contrib/rddads/tests/testmg.prg
@@ -65,16 +65,14 @@ PROCEDURE Main()
    LOCAL i
    LOCAL aRay
 
-#if defined( __HBSCRIPT__HBSHELL )
-   rddRegister( "ADS" )
-#endif
-
 #if defined( __HBDYNLOAD__RDDADS__ )
    LOCAL l := hb_libLoad( hb_libName( "rddads" + hb_libPostfix() ) )
 
    hb_rddADSRegister()
 
    HB_SYMBOL_UNUSED( l )
+#elif defined( __HBSCRIPT__HBSHELL )
+   hb_rddADSRegister()
 #endif
 
    rddSetDefault( "ADS" )