From 7ace5ecaea03210db3d1161da37c2b8117df82cb Mon Sep 17 00:00:00 2001
From: Paul Tucker <ptucker@sympatico.ca>
Date: Sat, 25 Sep 1999 04:38:49 +0000
Subject: [PATCH] *** empty log message ***

---
 harbour/ChangeLog            | 10 ++++++++++
 harbour/source/rtl/adir.prg  |  4 ++++
 harbour/source/rtl/asort.prg |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 86ad90bc67..66a0113c40 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,13 @@
+19990925-00:20 EDT Paul Tucker <ptucker@sympatico.ca>
+  * source/rtl/adir.prg
+    + Added an #ifdef HARBOUR_STRICT_CLIPPER_COMPATIBILITY around the
+      directory call.  The Clipper behaviour is strictly a bug and there
+      is no need to duplicate it.
+  * source/rtl/asort.prg
+    * The initial test to determine if the codeblock is going to return
+      a logical was passing a numeric as a test - and the codeblock may
+      not have been expecting it.
+
 19990925-05:57 GMT+1 Victor Szel <info@szelvesz.hu>
   * source/vm/dynsym.c
     ! HB___DYNSGETNAME() now validates the index parameter passed.
diff --git a/harbour/source/rtl/adir.prg b/harbour/source/rtl/adir.prg
index a1ff973d0b..52d6c01852 100644
--- a/harbour/source/rtl/adir.prg
+++ b/harbour/source/rtl/adir.prg
@@ -60,11 +60,15 @@ FUNCTION aDir( cFileMask, aName, aSize, aDate, aTime, aAttr )
 
    // ;
 
+#ifdef HARBOUR_STRICT_CLIPPER_COMPATIBILITY
    IF ISARRAY( aAttr )
       aDir := Directory( cFileMask, "HSD" )
    ELSE
       aDir := Directory( cFileMask )
    ENDIF
+#else
+   aDir := Directory( cFileMask, "HSD" )
+#endif
 
    IF ISARRAY( aName )
       nNameLen := Len( aName )
diff --git a/harbour/source/rtl/asort.prg b/harbour/source/rtl/asort.prg
index 44feb8d48e..70321e92d5 100644
--- a/harbour/source/rtl/asort.prg
+++ b/harbour/source/rtl/asort.prg
@@ -67,7 +67,7 @@ FUNCTION aSort( aArray, nStart, nCount, bBlock )
                   since the codeblock will be called one more time for the
                   first logical element than in Clipper. */
 
-         IF !ISBLOCK( bBlock ) .OR. !( ISLOG( Eval( bBlock, nStart, nStart ) ) )
+         IF !ISBLOCK( bBlock ) .OR. !( ISLOG( Eval( bBlock, aArray[1], aArray[1] ) ) )
             bBlock := {| x, y | x < y }
          ENDIF