diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b1523dd952..df51a43d4b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,14 @@ +2000-06-01 15:35 UTC-0400 David G. Holm + + * source/rtl/dates.c + - Removed sys/timeb.h, because it is not needed. + + * source/rtl/filesys.c + + Added OS_UNIX_COMPATIBLE to the __CYGWIN__ code for hb_fsEof() + + * source/rtl/gtdos/gtdos.c + + Added #defines to allow video modes to compile with __RSX32__ + 20000601-20:40 UTC+0100 Ryszard Glab *source/rtl/dates.c diff --git a/harbour/source/rtl/dates.c b/harbour/source/rtl/dates.c index 9643f4fe63..e86bbd4810 100644 --- a/harbour/source/rtl/dates.c +++ b/harbour/source/rtl/dates.c @@ -61,15 +61,6 @@ #include "hbapi.h" #include "hbdate.h" -/* NOTE: OS_UNIX_COMPATIBLE can be defined in file included from hbapi.h - * then checking have to be placed after hbapi.h -*/ -#if defined( OS_UNIX_COMPATIBLE ) - #include -#else - #include -#endif - long hb_dateEncode( long lYear, long lMonth, long lDay ) { HB_TRACE(HB_TR_DEBUG, ("hb_dateEncode(%ld, %ld, %ld)", lYear, lMonth, lDay)); diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 6ab8152b94..8f979d2921 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -1462,7 +1462,7 @@ BOOL hb_fsFile( BYTE * pFilename ) BOOL hb_fsEof( FHANDLE hFileHandle ) { -#if defined(__CYGWIN__) || defined( OS_UNIX_COMPATIBLE ) +#if defined(__CYGWIN__) || defined(OS_UNIX_COMPATIBLE) long curPos = lseek( hFileHandle, 0L, SEEK_CUR ); long endPos = lseek( hFileHandle, 0L, SEEK_END ); long newPos = lseek( hFileHandle, curPos, SEEK_SET ); diff --git a/harbour/source/rtl/gtdos/gtdos.c b/harbour/source/rtl/gtdos/gtdos.c index d108bc2e4e..77a8138467 100644 --- a/harbour/source/rtl/gtdos/gtdos.c +++ b/harbour/source/rtl/gtdos/gtdos.c @@ -79,7 +79,6 @@ #if defined(__DJGPP__) #include - #define outport outportw #include #include #elif defined(_MSC_VER) @@ -1178,7 +1177,13 @@ USHORT hb_gt_VertLine( USHORT uiCol, USHORT uiTop, USHORT uiBottom, BYTE byChar, #define INT_VIDEO 0x10 #if defined(__DJGPP__) - #define POKE_BYTE( s, o, b ) /* Do nothing */ + #define POKE_BYTE( s, o, b ) /* Do nothing */ + #define outport outportw /* Use correct function name */ +#elif defined(__RSX32__) + #define inportb( p ) 0 /* Return 0 */ + #define outport( p, w ) /* Do nothing */ + #define outportb( p, b ) /* Do nothing */ + #define POKE_BYTE( s, o, b ) (*((BYTE FAR *)MK_FP((s),(o)) )=(BYTE)(b)) #else #define POKE_BYTE( s, o, b ) (*((BYTE FAR *)MK_FP((s),(o)) )=(BYTE)(b)) #endif