From d8ae8f89a019beb27083e129494b29c2cdaf509d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 16 Mar 2000 23:18:38 +0000 Subject: [PATCH] 20000317-00:13 GMT+1 Victor Szakats --- harbour/ChangeLog | 8 ++++++++ harbour/makefile.bc | 6 ++++++ harbour/source/rtl/gt/gtpca.c | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b8adcc92d1..a2445992aa 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +20000317-00:13 GMT+1 Victor Szakats + * source/rtl/gt/gtpca.c + + Some internal functions made static + * makefile.bc + ! It's not relying on the default CC and AS macros, to make it work + on BCC45 without any cludges. BCC45 MAKE.EXE is defaulting to bcc or + bcc32 depending on the WIN32 macro. + 20000316-04:10 EST Paul Tucker * source/rtl/gt/gtpca.c * added casts diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 174f76c053..e22a31b7d9 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -9,6 +9,9 @@ !if $d(B16) +CC = bcc +AS = tasm + # Borland C/C++ (DOS 16 bits) CFLAGS = $(CFLAGS) -DHB_GT_DOS -mh @@ -18,6 +21,9 @@ LIB_DIR = lib\b16 !else +CC = bcc32 +AS = tasm32 + # Borland C/C++ (Windows 32 bits) CFLAGS = $(CFLAGS) -DHB_GT_WIN diff --git a/harbour/source/rtl/gt/gtpca.c b/harbour/source/rtl/gt/gtpca.c index 2549f26363..9c0406e98b 100644 --- a/harbour/source/rtl/gt/gtpca.c +++ b/harbour/source/rtl/gt/gtpca.c @@ -89,7 +89,7 @@ void hb_gt_Done( void ) /* TODO: */ } -void hb_gt_AnsiGetCurPos( USHORT * row, USHORT * col ) +static void hb_gt_AnsiGetCurPos( USHORT * row, USHORT * col ) { if( isatty( s_iFilenoStdin ) && isatty( s_iFilenoStdout ) ) { @@ -113,7 +113,7 @@ void hb_gt_AnsiGetCurPos( USHORT * row, USHORT * col ) } } -void hb_gt_AnsiSetAttributes( BYTE attr ) +static void hb_gt_AnsiSetAttributes( BYTE attr ) { static const int color[] = { 0, 4, 2, 6, 1, 5, 3, 7 }; int bg_color = 40 + color[ ( attr & 0x70 ) >> 4 ];