From df5d8f57b0e65928dfc18ed47eab12ddc092b9fd Mon Sep 17 00:00:00 2001
From: "David G. Holm" <dholm@jsd-llc.com>
Date: Tue, 17 Aug 1999 18:01:31 +0000
Subject: [PATCH] See ChangeLog entry 19990817-13:50 EDT David G. Holm
 <dholm@jsd-llc.com>

---
 harbour/ChangeLog                | 19 +++++++++++++++++++
 harbour/config/dos/global.cf     |  6 +++++-
 harbour/source/rtl/console.c     |  6 +++++-
 harbour/source/runner/runner.c   |  2 +-
 harbour/tests/working/dates4.prg |  2 +-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d346c63149..2ea155c171 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,22 @@
+19990817-13:50 EDT David G. Holm <dholm@jsd-llc.com>
+  * config/dos/global.cf
+    + Added code to leave COMSPEC alone instead of changing '\' to
+      '/' for bcc31, because NT chokes on '/' when using the Cygwin
+      GNU Make System to build the Borland C 3.1 version of Harbour.
+  * source/rtl/console.c
+    + Surrounded 'if( isatty( fileno( stdout ) ) )' in hb_outstd()
+      with '#ifndef __CYGWIN__' and '#endif'.
+    ! Corrected 'if( isatty( fileno( stdout ) ) )' in hb_outerr()
+      to check stderr instead of stdout.
+    + Surrounded 'if( isatty( fileno( stderr ) ) )' in hb_outerr()
+      with #ifndef '__CYGWIN__' and '#endif'.
+  * source/runner/runner.c
+    ! Added ')' that was missing from a conditional test.
+  * tests/working/dates4.prg
+    * Moved output of extra CR/LF pair in CheckDate() subroutine to
+      after the __Accept() call, because __Accept() already outputs
+      a CR/LF pair before displaying the prompt.
+
 19990817-17:13 GMT+1 Antonio Linares <alinares@fivetech.com>
    + source/debug/tbrwtext.prg
      * Class TBrwText for browsing debugger source code
diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf
index 0da5d83037..0d8f3bd44b 100644
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -15,7 +15,11 @@ MK := $(subst \,/,$(subst \~,~,$(MAKE)))
 ifeq ($(COMSPEC),) #location of command.com
   COMSPEC := command.com
 else
-  COMSPEC := $(subst \,/,$(COMSPEC))
+  ifeq ($(HB_COMPILER),bcc31)
+    #Use standard dos path, which is already set up.
+  else
+    COMSPEC := $(subst \,/,$(COMSPEC))
+  endif
 endif
 
 RM = del
diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c
index 2e81c144c8..e6657de8a3 100644
--- a/harbour/source/rtl/console.c
+++ b/harbour/source/rtl/console.c
@@ -295,7 +295,9 @@ static void hb_outstd( char * fpStr, ULONG len )
    while( count-- ) printf( "%c", *fpPtr++ );
    fflush( stdout );
 #ifdef HARBOUR_USE_GTAPI
+ #ifndef __CYGWIN__
    if( isatty( fileno( stdout ) ) )
+ #endif
    {
       dev_row = hb_gt_Row();
       dev_col = hb_gt_Col();
@@ -314,7 +316,9 @@ static void hb_outerr( char * fpStr, ULONG len )
    while( count-- ) fprintf( stderr, "%c", *fpPtr++ );
    fflush( stderr );
 #ifdef HARBOUR_USE_GTAPI
-   if( isatty( fileno( stdout ) ) )
+ #ifndef __CYGWIN__
+   if( isatty( fileno( stderr ) ) )
+ #endif
    {
       dev_row = hb_gt_Row();
       dev_col = hb_gt_Col();
diff --git a/harbour/source/runner/runner.c b/harbour/source/runner/runner.c
index 1251132eaa..bc0b67efa1 100644
--- a/harbour/source/runner/runner.c
+++ b/harbour/source/runner/runner.c
@@ -202,7 +202,7 @@ HARBOUR HB_HB_RUN( void )
           */
          for( ul = 0; ul < ulSymbols; ul++ )    /* Check INIT functions     */
          {
-            if( (pSymRead[ ul ].cScope & FS_INITEXIT == FS_INITEXIT )
+            if( (pSymRead[ ul ].cScope & FS_INITEXIT) == FS_INITEXIT )
             {
                 hb_vmPushSymbol( pSymRead + ul );
                 hb_vmPushNil();
diff --git a/harbour/tests/working/dates4.prg b/harbour/tests/working/dates4.prg
index 69fe98140c..f664fe4d3e 100644
--- a/harbour/tests/working/dates4.prg
+++ b/harbour/tests/working/dates4.prg
@@ -30,7 +30,7 @@ function CheckDate( dDate )
    OutStd( "Week of year...:", woy( dDate ), cNewLine )
    OutStd( "Begin of year..:", boy( dDate ), cNewLine )
    OutStd( "End of year....:", eoy( dDate ), cNewLine )
-   OutStd( chr( 10 ), chr( 10 ) )
    __Accept( "Press ENTER to continue..." )
+   OutStd( chr( 10 ), chr( 10 ) )
 
 return nil