mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-19 12:39:27 +02:00
* removed some 1.0 defines
git-svn-id: trunk@11979 -
This commit is contained in:
parent
a3d793a43f
commit
42282f0351
@ -137,10 +137,8 @@
|
||||
{$define HASOUTLINE}
|
||||
|
||||
{ Use inlining for small functions }
|
||||
{$ifndef VER1_0}
|
||||
{$inline on}
|
||||
{.$define USEINLINE}
|
||||
{$endif}
|
||||
|
||||
{$define TEST_PARTIAL_SYNTAX}
|
||||
{ $ undef UNDO}
|
||||
|
@ -83,11 +83,7 @@ USES
|
||||
{$ENDIF}
|
||||
|
||||
{$IFDEF OS_UNIX}
|
||||
{$ifdef VER1_0}
|
||||
linux,
|
||||
{$else}
|
||||
unixtype,baseunix,unix,
|
||||
{$endif}
|
||||
{$ENDIF}
|
||||
|
||||
{$IFDEF OS_NETWARE_LIBC}
|
||||
@ -737,14 +733,8 @@ Function GetDosTicks:longint; { returns ticks at 18.2 Hz, just like DOS }
|
||||
tv : TimeVal;
|
||||
{ tz : TimeZone;}
|
||||
begin
|
||||
{$ifdef ver1_0}
|
||||
GetTimeOfDay(tv{,tz});
|
||||
GetDosTicks:=((tv.Sec mod 86400) div 60)*1092+((tv.Sec mod 60)*1000000+tv.USec) div 54945;
|
||||
{$else}
|
||||
FPGetTimeOfDay(@tv,nil{,tz});
|
||||
GetDosTicks:=((tv.tv_Sec mod 86400) div 60)*1092+((tv.tv_Sec mod 60)*1000000+tv.tv_USec) div 54945;
|
||||
|
||||
{$endif}
|
||||
end;
|
||||
{$ENDIF OS_UNIX}
|
||||
{$IFDEF OS_WINDOWS}
|
||||
@ -794,7 +784,7 @@ end;
|
||||
begin
|
||||
req.tv_sec:=0;
|
||||
req.tv_nsec:=10000000;{ 10 ms }
|
||||
{$ifdef ver1_0}nanosleep(req,rem){$else}fpnanosleep(@req,@rem){$endif};
|
||||
fpnanosleep(@req,@rem);
|
||||
end;
|
||||
{$ENDIF}
|
||||
{$IFDEF OS_OS2}
|
||||
|
@ -24,11 +24,7 @@
|
||||
it should use ioctl to get information about resizing of windows }
|
||||
|
||||
uses
|
||||
{$ifdef VER1_0}
|
||||
linux;
|
||||
{$else}
|
||||
BaseUnix,termio;
|
||||
{$endif}
|
||||
|
||||
Const
|
||||
SystemEventActive : Boolean = false;
|
||||
@ -48,11 +44,7 @@ begin
|
||||
PendingSystemEvents:=0;
|
||||
FillChar(LastSystemEvent,sizeof(TSystemEvent),0);
|
||||
FillChar(WinSize,sizeof(WinSize),0);
|
||||
{$ifdef VER1_0}
|
||||
ioctl(stdinputhandle,TIOCGWINSZ,@winsize);
|
||||
{$else}
|
||||
fpioctl(stdinputhandle,TIOCGWINSZ,@winsize);
|
||||
{$endif}
|
||||
LastXSize:=WinSize.ws_row;
|
||||
LastYSize:=WinSize.ws_col;
|
||||
If LastXSize=0 then
|
||||
@ -103,11 +95,7 @@ begin
|
||||
else
|
||||
begin
|
||||
FillChar(WinSize,sizeof(WinSize),0);
|
||||
{$ifdef VER1_0}
|
||||
ioctl(stdinputhandle,TIOCGWINSZ,@winsize);
|
||||
{$else}
|
||||
fpioctl(stdinputhandle,TIOCGWINSZ,@winsize);
|
||||
{$endif}
|
||||
if (winsize.ws_col<>0) and (winsize.ws_row<>0) and
|
||||
((winsize.ws_row<>lastxsize) or (winsize.ws_col<>lastysize)) then
|
||||
begin
|
||||
|
Loading…
Reference in New Issue
Block a user