From 8b35574427ef6ebf20519c9908dbab4ea5ff3f8d Mon Sep 17 00:00:00 2001 From: Maurilio Longo Date: Mon, 17 Apr 2000 14:11:40 +0000 Subject: [PATCH] 20000417-16:06 GMT+2 Maurilio Longo --- harbour/ChangeLog | 11 +++++++++-- harbour/config/os2/gcc.cf | 4 ++-- harbour/source/rtl/gtos2/gtos2.c | 8 ++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9ba79b5b7a..50babc3d1b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,10 @@ +20000417-16:06 GMT+2 Maurilio Longo + + * config/os2/gcc.cf + ! hope it's last time; before deleting old .a check if it exists + * source/rtl/gtos2/gtos2.c + ! a few calls to TRACE macro with wrong parameters name + 20000417-15:55 GMT+1 Ryszard Glab *source/rtl/diskspac.c @@ -34,10 +41,10 @@ *changed to use HB_XREGS *source/rtl/gtapi.c - *fixed printing using console output + *fixed printing using console output *source/rtl/gtcrs/gtcrs.c - *altarnate characters set is disabled for xterm + *altarnate characters set is disabled for xterm 20000417-06:32 GMT+1 Victor Szakats diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 8d49f5d1be..edf510f510 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -60,9 +60,9 @@ echo END >> __lib__.tmp $(AR) -M < __lib__.tmp endef -# Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is & +# Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is & AR = ar ARFLAGS = -AR_RULE = $(RM) $@ & $(create_library) & $(RM) __lib__.tmp +AR_RULE = IF EXIST $@ $(RM) $@ & $(create_library) & $(RM) __lib__.tmp include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/source/rtl/gtos2/gtos2.c b/harbour/source/rtl/gtos2/gtos2.c index ad38c0b5de..a4ec04773e 100644 --- a/harbour/source/rtl/gtos2/gtos2.c +++ b/harbour/source/rtl/gtos2/gtos2.c @@ -367,7 +367,7 @@ void hb_gt_Scroll( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight, { /* Chen Kedem */ - HB_TRACE(HB_TR_DEBUG, ("hb_gt_Scroll(%hu, %hu, %hu, %hu, %d, %hd, %hd)", usTop, usLeft, usBottom, usRigth, (int) attr, sVert, sHoriz)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_Scroll(%hu, %hu, %hu, %hu, %d, %hd, %hd)", usTop, usLeft, usBottom, usRight, (int) attr, sVert, sHoriz)); if(s_uiDispCount > 0) { @@ -634,7 +634,7 @@ int hb_gt_RectSize( USHORT rows, USHORT cols ) void hb_gt_GetText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight, BYTE *dest ) { - HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetText(%hu, %hu, %hu, %hu, %p)", usTop, usLeft, usBottom, usRigth, dest)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetText(%hu, %hu, %hu, %hu, %p)", usTop, usLeft, usBottom, usRight, dest)); if(s_uiDispCount > 0) { USHORT x, y; @@ -659,7 +659,7 @@ void hb_gt_GetText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight void hb_gt_PutText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight, BYTE *srce ) { - HB_TRACE(HB_TR_DEBUG, ("hb_gt_PutText(%hu, %hu, %hu, %hu, %p)", usTop, usLeft, usBottom, usRigth, srce)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_PutText(%hu, %hu, %hu, %hu, %p)", usTop, usLeft, usBottom, usRight, srce)); if(s_uiDispCount > 0) { USHORT x, y; @@ -688,7 +688,7 @@ void hb_gt_SetAttribute( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT us TODO: work with DispBegin DispEnd */ - HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetAttribute(%hu, %hu, %hu, %hu, %d)", usTop, usLeft, usBottom, usRigth, (int) attr)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetAttribute(%hu, %hu, %hu, %hu, %d)", usTop, usLeft, usBottom, usRight, (int) attr)); if(s_uiDispCount >0) {