From 6cabe42b515373ec5829e49930d0066dd7cb124e Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Tue, 15 Jan 2002 00:21:16 +0000 Subject: [PATCH] See ChangeLog entry 2002-01-14 19:15 UTC-0500 David G. Holm --- harbour/ChangeLog | 19 +++++++++++++++++++ harbour/contrib/libct/files.c | 8 ++++---- harbour/contrib/libct/keyset.c | 6 +++++- harbour/contrib/libgt/Makefile | 2 +- harbour/contrib/libgt/makefile.bc | 2 +- harbour/contrib/libgt/makefile.vc | 2 +- harbour/source/common/hbffind.c | 4 +++- harbour/source/common/hbfhnd.c | 4 ++-- harbour/source/common/hbgete.c | 2 +- harbour/source/rtl/filehb.c | 2 +- 10 files changed, 38 insertions(+), 13 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2fb139f881..55ffdb2838 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,25 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + * contrib/rdd_ads/ads1.c + * Added virtual method adsExit() with a call of AdsApplicationExit() + +2002-01-15 20:40 UTC+0300 Alexander Kresin + * source/pp/ppcore.c + ! bug fixed, reported by Juan Agustin Barriga + +2002-01-15 11:25 UTC+0300 Alexander Kresin + * source/rdd/dbfntx/dbfntx1.c + ! bug fixed, reported by Wilson 'W' Gamboa A ( indexing of an empty dbf ) + +2002-01-14 21:53 UTC-0500 Paul Tucker + * source\common\hbffind.c + * replaced 3 literals with proper defines + * minor formatting. + +2002-01-14 21:32 UTC-0500 Paul Tucker + * source\rtl\direct.c + * updated default flags to include ReadOnly 2002-01-14 19:15 UTC-0500 David G. Holm * contrib/libct/files.c diff --git a/harbour/contrib/libct/files.c b/harbour/contrib/libct/files.c index 7ddd131ad5..eb9e71364a 100644 --- a/harbour/contrib/libct/files.c +++ b/harbour/contrib/libct/files.c @@ -68,9 +68,9 @@ static struct ffblk fsOldFiles; #define MAXGETHOSTNAME 256 /* should be enough for a host name */ -#elif defined(HB_OS_DOS) +#elif defined(HB_OS_DOS) && !defined(__RSX32__) - #if defined(__DJGPP__) || defined(__RSX32__) + #if defined(__DJGPP__) #include #endif #include "hb_io.h" @@ -94,7 +94,7 @@ static HANDLE hLastFind; static WIN32_FIND_DATA Lastff32; LPTSTR GetDate(FILETIME *rTime); LPTSTR GetTime(FILETIME *rTime); -#if !defined(_MSC_VER) +#if !defined(_MSC_VER) && !defined(__RSXNT__) #include #endif #endif @@ -705,7 +705,7 @@ HB_FUNC(FILETIME) } -#if (defined(HB_OS_WIN_32) || defined(__MINGW32__)) && !defined(__CYGWIN__) +#if (defined(HB_OS_WIN_32) || defined(__MINGW32__)) && !defined(__CYGWIN__) && !defined(__RSXNT__) #include diff --git a/harbour/contrib/libct/keyset.c b/harbour/contrib/libct/keyset.c index 918807aa3f..60d6a3c1c4 100644 --- a/harbour/contrib/libct/keyset.c +++ b/harbour/contrib/libct/keyset.c @@ -63,6 +63,10 @@ #include "sys\farptr.h" #elif defined(__MSC_VER) #include "signal.h" +#elif defined(__BORLANDC__) + #ifndef FAR + #define FAR far /* Because FAR is not defined for Borland C 3.x */ + #endif #endif static void SetGet( char cKey ); @@ -239,7 +243,7 @@ static void SetGet( char cKey ) #else - *( ( char FAR * ) MK_FP( 0x0040, 0x0017 ) ) = ( *( ( char FAR * ) MK_FP( 0x0040, 0x0017 ) ) & ( !cKey ) ) | cKey ); + *( ( char FAR * ) MK_FP( 0x0040, 0x0017 ) ) = ( *( ( char FAR * ) MK_FP( 0x0040, 0x0017 ) ) & ( !cKey ) ) | cKey; #endif } diff --git a/harbour/contrib/libgt/Makefile b/harbour/contrib/libgt/Makefile index 16a050fed2..c6ad0b32db 100644 --- a/harbour/contrib/libgt/Makefile +++ b/harbour/contrib/libgt/Makefile @@ -25,6 +25,6 @@ C_SOURCES=\ PRG_SOURCES=\ -LIBNAME=libgt +LIBNAME=gt include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/libgt/makefile.bc b/harbour/contrib/libgt/makefile.bc index 707d4a33b5..52b63fcbbe 100644 --- a/harbour/contrib/libgt/makefile.bc +++ b/harbour/contrib/libgt/makefile.bc @@ -77,7 +77,7 @@ LDFLAGS = $(LDFLAGS) # Macros to access our library names # -TOOLS_LIB = $(LIB_DIR)\libgt.lib +TOOLS_LIB = $(LIB_DIR)\gt.lib HARBOUR_EXE = $(BIN_DIR)\harbour.exe diff --git a/harbour/contrib/libgt/makefile.vc b/harbour/contrib/libgt/makefile.vc index a4b257fb26..18838b0902 100644 --- a/harbour/contrib/libgt/makefile.vc +++ b/harbour/contrib/libgt/makefile.vc @@ -76,7 +76,7 @@ LDFLAGS = $(LDFLAGS) # Macros to access our library names # -TOOLS_LIB = $(LIB_DIR)\libgt.lib +TOOLS_LIB = $(LIB_DIR)\gt.lib HARBOUR_EXE = $(BIN_DIR)\harbour.exe diff --git a/harbour/source/common/hbffind.c b/harbour/source/common/hbffind.c index c8ceb0597d..0d5086392d 100644 --- a/harbour/source/common/hbffind.c +++ b/harbour/source/common/hbffind.c @@ -71,6 +71,8 @@ HB_FILE_VER( "$Id$" ) #if defined(__DJGPP__) || defined(__RSX32__) #include + #endif + #if defined(__DJGPP__) || defined(__RSX32__) || defined(__BORLANDC__) #include #endif #include @@ -866,7 +868,7 @@ void hb_fsFindClose( PHB_FFIND ffind ) #if defined(HB_OS_DOS) - #if defined(__DJGPP__) + #if defined(__DJGPP__) || defined(__BORLANDC__) { HB_SYMBOL_UNUSED( info ); } diff --git a/harbour/source/common/hbfhnd.c b/harbour/source/common/hbfhnd.c index 207d30cb8d..80ef3fe3f2 100644 --- a/harbour/source/common/hbfhnd.c +++ b/harbour/source/common/hbfhnd.c @@ -50,7 +50,7 @@ * */ -#if defined(__BORLANDC__) +#if defined(HB_OS_WIN_32) && defined(__BORLANDC__) #define ___NFILE_H @@ -92,7 +92,7 @@ void hb_fhnd_ForceLink( void ) /* Intentionally do nothing */ }; -#if defined(__BORLANDC__) +#if defined(HB_OS_WIN_32) && defined(__BORLANDC__) #define _F_STDIN (_F_READ | _F_TERM | _F_LBUF) #define _F_STDOUT (_F_WRIT | _F_TERM | _F_LBUF) diff --git a/harbour/source/common/hbgete.c b/harbour/source/common/hbgete.c index 76d58b23d7..a0971468f6 100644 --- a/harbour/source/common/hbgete.c +++ b/harbour/source/common/hbgete.c @@ -84,7 +84,7 @@ char * hb_getenv( const char * szName ) #elif defined(HB_OS_OS2) { - PSZ EnvValue = ""; + PCSZ EnvValue = ""; if( DosScanEnv( szName, &EnvValue ) == NO_ERROR ) { diff --git a/harbour/source/rtl/filehb.c b/harbour/source/rtl/filehb.c index 289931e545..bc016b197b 100644 --- a/harbour/source/rtl/filehb.c +++ b/harbour/source/rtl/filehb.c @@ -58,5 +58,5 @@ HB_FUNC( FILE ) { - hb_retl( ISCHAR( 1 ) ? hb_spFile( ( unsigned char * ) hb_parc( 1 ) ) : FALSE ); + hb_retl( ISCHAR( 1 ) ? hb_spFile( ( BYTE * ) hb_parc( 1 ) ) : FALSE ); }