From 23afd6ee0a1c4fd6c14d848d0ceb31f85b9f1ea9 Mon Sep 17 00:00:00 2001
From: "David G. Holm" <dholm@jsd-llc.com>
Date: Thu, 3 Jun 1999 04:32:26 +0000
Subject: [PATCH] See ChangeLog entry 19990602-23:30 EDT David G. Holm
 <dholm@jsd-llc.com>

---
 harbour/ChangeLog                    | 11 +++++++++++
 harbour/source/compiler/makefile.dos |  2 +-
 harbour/source/rtl/console.c         | 18 ++++++++++++++++++
 harbour/source/rtl/gtapi.c           | 10 ----------
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7927f3b4eb..e50cf56c52 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,14 @@
+19990602-23:30 EDT David G. Holm <dholm@jsd-llc.com>
+  * source/compiler/makefile.dos
+    - bison needs -y option so that it won't replace harbour.c with y_tab.c
+      when building Harbour with DJGPP
+  * source/rtl/console.c
+    - Moved MAXROW() and MAXCOL() from gtapi.c and added #ifdef USE_GTAPI
+      in each. The #else condition defines the screen as 24x80 (23, 79)
+  * source/rtl/gtapi.c
+    - Moved MAXROW() and MAXCOL() to console.c in order to not include the
+      GT API when it isn't wanted (such as when building with DJGPP)
+
 19990602-20:45 EDT David G. Holm <dholm@jsd-llc.com>
   * source/rtl/environ.c
     - Modified #ifdef _Windows section to return "Windows"
diff --git a/harbour/source/compiler/makefile.dos b/harbour/source/compiler/makefile.dos
index b24ea61fd8..de235fc2e0 100644
--- a/harbour/source/compiler/makefile.dos
+++ b/harbour/source/compiler/makefile.dos
@@ -13,7 +13,7 @@ $(TARGET): y_tab.c harbour.c lexyy.c
 	$(CC) $(CFLAGS) y_tab.c harbour.c lexyy.c -o $(TARGET)
 
 y_tab.c : harbour.y
-	bison -d -v harbour.y -o y_tab.c
+	bison -d -v -y harbour.y -o y_tab.c
 
 lexyy.c : harbour.l
 	flex -i -8 -olexyy.c harbour.l
diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c
index 593cc1d0e7..964bfcfa85 100644
--- a/harbour/source/rtl/console.c
+++ b/harbour/source/rtl/console.c
@@ -345,3 +345,21 @@ HARBOUR SCROLL( void ) /* Scrolls a screen region (requires the GT API) */
     _gtScroll( top, left, bottom, right, v_scroll, h_scroll );
 #endif
 }
+
+HARBOUR MAXROW( void ) /* Return the maximum screen row number (zero origin) */
+{
+#ifdef USE_GTAPI
+   _retni( _gtMaxRow () );
+#else
+   _retni( 23 );
+#endif
+}
+
+HARBOUR MAXCOL( void ) /* Return the maximum screen column number (zero origin) */
+{
+#ifdef USE_GTAPI
+   _retni( _gtMaxCol () );
+#else
+   _retni( 79 );
+#endif
+}
diff --git a/harbour/source/rtl/gtapi.c b/harbour/source/rtl/gtapi.c
index 65c091035c..0cccb6de8d 100644
--- a/harbour/source/rtl/gtapi.c
+++ b/harbour/source/rtl/gtapi.c
@@ -492,16 +492,6 @@ int _gtScroll(USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, SHOR
    return(0);
 }
 
-HARBOUR MAXROW( void ) /* Return the maximum screen row number (zero origin) */
-{
-   _retni( _gtMaxRow () );
-}
-
-HARBOUR MAXCOL( void ) /* Return the maximum screen column number (zero origin) */
-{
-   _retni( _gtMaxCol () );
-}
-
 #ifdef TEST
 void main(void)
 {