From 3736333c9a7d4f26c462ce465221d47b2228ef1a Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 4 Jun 2002 11:12:41 +0000 Subject: [PATCH] * Renamefest --- fv/colortxt.pas | 2 +- fv/drivers.pas | 15 +++++++++------ fv/editors.pas | 2 +- fv/fileio.pas | 30 ++++++++++++------------------ fv/fvcommon.pas | 7 +++++-- fv/inplong.pas | 2 +- fv/resource.pas | 2 +- fv/statuses.pas | 2 +- fv/time.pas | 17 ++++++++++------- fvision/colortxt.pas | 2 +- fvision/drivers.pas | 15 +++++++++------ fvision/editors.pas | 2 +- fvision/fileio.pas | 30 ++++++++++++------------------ fvision/fvcommon.pas | 7 +++++-- fvision/inplong.pas | 2 +- fvision/resource.pas | 2 +- fvision/statuses.pas | 2 +- fvision/time.pas | 17 ++++++++++------- 18 files changed, 82 insertions(+), 76 deletions(-) diff --git a/fv/colortxt.pas b/fv/colortxt.pas index af22508038..bb36ff6e39 100644 --- a/fv/colortxt.pas +++ b/fv/colortxt.pas @@ -18,7 +18,7 @@ unit ColorTxt; {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fv/drivers.pas b/fv/drivers.pas index 91a051953c..1e14fa5340 100644 --- a/fv/drivers.pas +++ b/fv/drivers.pas @@ -46,7 +46,7 @@ UNIT Drivers; {$X+} { Extended syntax is ok } {$R-} { Disable range checking } -{$IFNDEF OS_LINUX} +{$IFNDEF OS_UNIX} {$S-} { Disable Stack Checking } {$ENDIF} {$I-} { Disable IO Checking } @@ -68,7 +68,7 @@ USES {$ENDIF} {$ENDIF} - {$IFDEF OS_LINUX} + {$IFDEF OS_UNIX} {$ifdef VER1_0} linux, {$else} @@ -704,7 +704,7 @@ Function GetDosTicks:longint; { returns ticks at 18.2 Hz, just like DOS } GetDosTicks := L div 55; end; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} var tv : TimeVal; { tz : TimeZone;} @@ -712,7 +712,7 @@ Function GetDosTicks:longint; { returns ticks at 18.2 Hz, just like DOS } GetTimeOfDay(tv{,tz}); GetDosTicks:=((tv.Sec mod 86400) div 60)*1092+((tv.Sec mod 60)*1000000+tv.USec) div 54945; end; -{$ENDIF OS_LINUX} +{$ENDIF OS_UNIX} {$IFDEF OS_WINDOWS} begin GetDosTicks:=GetTickCount div 55; @@ -752,7 +752,7 @@ END; {---------------------------------------------------------------------------} { ExitDrivers -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 08Jun98 LdB } {---------------------------------------------------------------------------} -PROCEDURE ExitDrivers; {$IFNDEF OS_LINUX} FAR; {$ENDIF} +PROCEDURE ExitDrivers; {$IFNDEF OS_UNIX} FAR; {$ENDIF} BEGIN DoneSysError; { Relase error trap } DoneEvents; { Close event driver } @@ -1629,7 +1629,10 @@ BEGIN END. { $Log$ - Revision 1.23 2002-05-31 12:38:37 pierre + Revision 1.24 2002-06-04 11:12:41 marco + * Renamefest + + Revision 1.23 2002/05/31 12:38:37 pierre * try to enhance graph mode Revision 1.22 2002/05/29 21:21:54 pierre diff --git a/fv/editors.pas b/fv/editors.pas index ad98c3e9f6..a2e78610a9 100644 --- a/fv/editors.pas +++ b/fv/editors.pas @@ -8,7 +8,7 @@ unit Editors; {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fv/fileio.pas b/fv/fileio.pas index ea671fa1ae..8f07d9a71f 100644 --- a/fv/fileio.pas +++ b/fv/fileio.pas @@ -75,7 +75,7 @@ UNIT FileIO; {$X+} { Extended syntax is ok } {$R-} { Disable range checking } -{$IFNDEF OS_LINUX} +{$IFNDEF OS_UNIX} {$S-} { Disable Stack Checking } {$ENDIF} {$I-} { Disable IO Checking } @@ -227,16 +227,7 @@ FUNCTION FileWrite (Handle: THandle; Var Buf; Count: Sw_Word; Var Actual: Sw_Wor {$ENDIF} -{$IFDEF OS_LINUX} { LINUX COMPILER } - USES - {$ifdef VER1_0} - linux; - {$else} - unix; - {$endif} -{$ENDIF} - -{$IFDEF OS_FREEBSD} { FREEBSD COMPILER } +{$IFDEF OS_UNIX} { LINUX COMPILER } USES {$ifdef VER1_0} linux; @@ -296,7 +287,7 @@ BEGIN Else FileClose := False; { Closure failed } END; {$ENDIF} -{$IFDEF OS_LINUX} { LINUX CODE } +{$IFDEF OS_UNIX} { LINUX CODE } BEGIN fdClose(Handle); { Close the file } FileClose := LinuxError <= 0 @@ -394,7 +385,7 @@ BEGIN {$ENDIF} END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} BEGIN if mode = fa_Create then mode := Open_Creat or Open_RdWr else if mode = fa_OpenRead then mode := Open_RdOnly else @@ -474,7 +465,7 @@ BEGIN {$ENDIF} END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} VAR Actual : LongInt; BEGIN @@ -554,7 +545,7 @@ BEGIN {$ENDIF} END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} BEGIN Actual := fdSeek(Handle, Pos, MoveType); If (Actual <> -1) Then SetFilePos := 0 Else { No position error } @@ -618,7 +609,7 @@ BEGIN FileRead := 104; { File read error } END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} BEGIN Actual := fdRead(Handle, Buf, Count); if (Actual = Count) Then FileRead := 0 { No read error } @@ -682,7 +673,7 @@ BEGIN FileWrite := 105; { File write error } END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} BEGIN Actual := fdWrite(Handle, Buf, Count); If (Actual = Count) Then FileWrite := 0 Else { No write error } @@ -693,7 +684,10 @@ END; END. { $Log$ - Revision 1.5 2001-08-04 19:14:33 peter + Revision 1.6 2002-06-04 11:12:41 marco + * Renamefest + + Revision 1.5 2001/08/04 19:14:33 peter * Added Makefiles * added FV specific units and objects from old FV diff --git a/fv/fvcommon.pas b/fv/fvcommon.pas index 1d51219c12..2a8fdcd768 100644 --- a/fv/fvcommon.pas +++ b/fv/fvcommon.pas @@ -144,7 +144,7 @@ TYPE {$IFDEF OS_ATARI} { ATARI DEFINITION } THandle = Integer; { Handles are 16 bits } {$ENDIF} -{$IFDEF OS_LINUX} { LINUX DEFINITIONS } +{$IFDEF OS_UNIX} { LINUX DEFINITIONS } { values are words, though the OS calls return 32-bit values } { to check (CEC) } THandle = LongInt; { Simulated 32 bits } @@ -416,7 +416,10 @@ END; END. { $Log$ - Revision 1.2 2001-08-05 02:03:13 peter + Revision 1.3 2002-06-04 11:12:41 marco + * Renamefest + + Revision 1.2 2001/08/05 02:03:13 peter * view redrawing and small cursor updates * merged some more FV extensions diff --git a/fv/inplong.pas b/fv/inplong.pas index 38cd542118..54a0b0eaeb 100644 --- a/fv/inplong.pas +++ b/fv/inplong.pas @@ -71,7 +71,7 @@ Valid returns False. {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fv/resource.pas b/fv/resource.pas index c0366f6283..623f8d5e96 100644 --- a/fv/resource.pas +++ b/fv/resource.pas @@ -33,7 +33,7 @@ interface {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fv/statuses.pas b/fv/statuses.pas index edb0cc2b7e..b21c3d1fd3 100644 --- a/fv/statuses.pas +++ b/fv/statuses.pas @@ -58,7 +58,7 @@ interface {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fv/time.pas b/fv/time.pas index 9c8181ebad..23771c5de2 100644 --- a/fv/time.pas +++ b/fv/time.pas @@ -171,9 +171,9 @@ PROCEDURE SecondsToTime (Sd: LongInt; Var Hour24, Minute, Second: Word); {$ENDIF} -{$ifdef OS_LINUX} +{$ifdef OS_UNIX} USES Dos; -{$endif OS_LINUX} +{$endif OS_UNIX} {***************************************************************************} { INTERFACE ROUTINES } @@ -302,11 +302,11 @@ BEGIN DosSetDateTime(DT); { Set the time } END; {$ENDIF} -{$ifdef OS_LINUX} +{$ifdef OS_UNIX} BEGIN {settime is dummy in Linux} END; -{$endif OS_LINUX} +{$endif OS_UNIX} {---------------------------------------------------------------------------} { GetTime -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 06Nov97 LdB } @@ -409,11 +409,11 @@ BEGIN Sec100 := DT.Hundredths; { Transfer hundredths } END; {$ENDIF} -{$ifdef OS_LINUX} +{$ifdef OS_UNIX} BEGIN Dos.GetTime(Hour,Minute,Second,Sec100); END; -{$endif OS_LINUX} +{$endif OS_UNIX} {---------------------------------------------------------------------------} { MinutesToTime -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 19Jun97 LdB } @@ -438,7 +438,10 @@ END. { $Log$ - Revision 1.5 2002-06-03 20:26:16 pierre + Revision 1.6 2002-06-04 11:12:41 marco + * Renamefest + + Revision 1.5 2002/06/03 20:26:16 pierre * use local time for windows Revision 1.4 2001/05/04 09:04:08 pierre diff --git a/fvision/colortxt.pas b/fvision/colortxt.pas index af22508038..bb36ff6e39 100644 --- a/fvision/colortxt.pas +++ b/fvision/colortxt.pas @@ -18,7 +18,7 @@ unit ColorTxt; {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fvision/drivers.pas b/fvision/drivers.pas index 91a051953c..1e14fa5340 100644 --- a/fvision/drivers.pas +++ b/fvision/drivers.pas @@ -46,7 +46,7 @@ UNIT Drivers; {$X+} { Extended syntax is ok } {$R-} { Disable range checking } -{$IFNDEF OS_LINUX} +{$IFNDEF OS_UNIX} {$S-} { Disable Stack Checking } {$ENDIF} {$I-} { Disable IO Checking } @@ -68,7 +68,7 @@ USES {$ENDIF} {$ENDIF} - {$IFDEF OS_LINUX} + {$IFDEF OS_UNIX} {$ifdef VER1_0} linux, {$else} @@ -704,7 +704,7 @@ Function GetDosTicks:longint; { returns ticks at 18.2 Hz, just like DOS } GetDosTicks := L div 55; end; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} var tv : TimeVal; { tz : TimeZone;} @@ -712,7 +712,7 @@ Function GetDosTicks:longint; { returns ticks at 18.2 Hz, just like DOS } GetTimeOfDay(tv{,tz}); GetDosTicks:=((tv.Sec mod 86400) div 60)*1092+((tv.Sec mod 60)*1000000+tv.USec) div 54945; end; -{$ENDIF OS_LINUX} +{$ENDIF OS_UNIX} {$IFDEF OS_WINDOWS} begin GetDosTicks:=GetTickCount div 55; @@ -752,7 +752,7 @@ END; {---------------------------------------------------------------------------} { ExitDrivers -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 08Jun98 LdB } {---------------------------------------------------------------------------} -PROCEDURE ExitDrivers; {$IFNDEF OS_LINUX} FAR; {$ENDIF} +PROCEDURE ExitDrivers; {$IFNDEF OS_UNIX} FAR; {$ENDIF} BEGIN DoneSysError; { Relase error trap } DoneEvents; { Close event driver } @@ -1629,7 +1629,10 @@ BEGIN END. { $Log$ - Revision 1.23 2002-05-31 12:38:37 pierre + Revision 1.24 2002-06-04 11:12:41 marco + * Renamefest + + Revision 1.23 2002/05/31 12:38:37 pierre * try to enhance graph mode Revision 1.22 2002/05/29 21:21:54 pierre diff --git a/fvision/editors.pas b/fvision/editors.pas index ad98c3e9f6..a2e78610a9 100644 --- a/fvision/editors.pas +++ b/fvision/editors.pas @@ -8,7 +8,7 @@ unit Editors; {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fvision/fileio.pas b/fvision/fileio.pas index ea671fa1ae..8f07d9a71f 100644 --- a/fvision/fileio.pas +++ b/fvision/fileio.pas @@ -75,7 +75,7 @@ UNIT FileIO; {$X+} { Extended syntax is ok } {$R-} { Disable range checking } -{$IFNDEF OS_LINUX} +{$IFNDEF OS_UNIX} {$S-} { Disable Stack Checking } {$ENDIF} {$I-} { Disable IO Checking } @@ -227,16 +227,7 @@ FUNCTION FileWrite (Handle: THandle; Var Buf; Count: Sw_Word; Var Actual: Sw_Wor {$ENDIF} -{$IFDEF OS_LINUX} { LINUX COMPILER } - USES - {$ifdef VER1_0} - linux; - {$else} - unix; - {$endif} -{$ENDIF} - -{$IFDEF OS_FREEBSD} { FREEBSD COMPILER } +{$IFDEF OS_UNIX} { LINUX COMPILER } USES {$ifdef VER1_0} linux; @@ -296,7 +287,7 @@ BEGIN Else FileClose := False; { Closure failed } END; {$ENDIF} -{$IFDEF OS_LINUX} { LINUX CODE } +{$IFDEF OS_UNIX} { LINUX CODE } BEGIN fdClose(Handle); { Close the file } FileClose := LinuxError <= 0 @@ -394,7 +385,7 @@ BEGIN {$ENDIF} END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} BEGIN if mode = fa_Create then mode := Open_Creat or Open_RdWr else if mode = fa_OpenRead then mode := Open_RdOnly else @@ -474,7 +465,7 @@ BEGIN {$ENDIF} END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} VAR Actual : LongInt; BEGIN @@ -554,7 +545,7 @@ BEGIN {$ENDIF} END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} BEGIN Actual := fdSeek(Handle, Pos, MoveType); If (Actual <> -1) Then SetFilePos := 0 Else { No position error } @@ -618,7 +609,7 @@ BEGIN FileRead := 104; { File read error } END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} BEGIN Actual := fdRead(Handle, Buf, Count); if (Actual = Count) Then FileRead := 0 { No read error } @@ -682,7 +673,7 @@ BEGIN FileWrite := 105; { File write error } END; {$ENDIF} -{$IFDEF OS_LINUX} +{$IFDEF OS_UNIX} BEGIN Actual := fdWrite(Handle, Buf, Count); If (Actual = Count) Then FileWrite := 0 Else { No write error } @@ -693,7 +684,10 @@ END; END. { $Log$ - Revision 1.5 2001-08-04 19:14:33 peter + Revision 1.6 2002-06-04 11:12:41 marco + * Renamefest + + Revision 1.5 2001/08/04 19:14:33 peter * Added Makefiles * added FV specific units and objects from old FV diff --git a/fvision/fvcommon.pas b/fvision/fvcommon.pas index 1d51219c12..2a8fdcd768 100644 --- a/fvision/fvcommon.pas +++ b/fvision/fvcommon.pas @@ -144,7 +144,7 @@ TYPE {$IFDEF OS_ATARI} { ATARI DEFINITION } THandle = Integer; { Handles are 16 bits } {$ENDIF} -{$IFDEF OS_LINUX} { LINUX DEFINITIONS } +{$IFDEF OS_UNIX} { LINUX DEFINITIONS } { values are words, though the OS calls return 32-bit values } { to check (CEC) } THandle = LongInt; { Simulated 32 bits } @@ -416,7 +416,10 @@ END; END. { $Log$ - Revision 1.2 2001-08-05 02:03:13 peter + Revision 1.3 2002-06-04 11:12:41 marco + * Renamefest + + Revision 1.2 2001/08/05 02:03:13 peter * view redrawing and small cursor updates * merged some more FV extensions diff --git a/fvision/inplong.pas b/fvision/inplong.pas index 38cd542118..54a0b0eaeb 100644 --- a/fvision/inplong.pas +++ b/fvision/inplong.pas @@ -71,7 +71,7 @@ Valid returns False. {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fvision/resource.pas b/fvision/resource.pas index c0366f6283..623f8d5e96 100644 --- a/fvision/resource.pas +++ b/fvision/resource.pas @@ -33,7 +33,7 @@ interface {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fvision/statuses.pas b/fvision/statuses.pas index edb0cc2b7e..b21c3d1fd3 100644 --- a/fvision/statuses.pas +++ b/fvision/statuses.pas @@ -58,7 +58,7 @@ interface {$F+,O+,E+,N+} {$endif} {$X+,R-,I-,Q-,V-} -{$ifndef OS_LINUX} +{$ifndef OS_UNIX} {$S-} {$endif} diff --git a/fvision/time.pas b/fvision/time.pas index 9c8181ebad..23771c5de2 100644 --- a/fvision/time.pas +++ b/fvision/time.pas @@ -171,9 +171,9 @@ PROCEDURE SecondsToTime (Sd: LongInt; Var Hour24, Minute, Second: Word); {$ENDIF} -{$ifdef OS_LINUX} +{$ifdef OS_UNIX} USES Dos; -{$endif OS_LINUX} +{$endif OS_UNIX} {***************************************************************************} { INTERFACE ROUTINES } @@ -302,11 +302,11 @@ BEGIN DosSetDateTime(DT); { Set the time } END; {$ENDIF} -{$ifdef OS_LINUX} +{$ifdef OS_UNIX} BEGIN {settime is dummy in Linux} END; -{$endif OS_LINUX} +{$endif OS_UNIX} {---------------------------------------------------------------------------} { GetTime -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 06Nov97 LdB } @@ -409,11 +409,11 @@ BEGIN Sec100 := DT.Hundredths; { Transfer hundredths } END; {$ENDIF} -{$ifdef OS_LINUX} +{$ifdef OS_UNIX} BEGIN Dos.GetTime(Hour,Minute,Second,Sec100); END; -{$endif OS_LINUX} +{$endif OS_UNIX} {---------------------------------------------------------------------------} { MinutesToTime -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 19Jun97 LdB } @@ -438,7 +438,10 @@ END. { $Log$ - Revision 1.5 2002-06-03 20:26:16 pierre + Revision 1.6 2002-06-04 11:12:41 marco + * Renamefest + + Revision 1.5 2002/06/03 20:26:16 pierre * use local time for windows Revision 1.4 2001/05/04 09:04:08 pierre