From 42282f0351c419353efbaaac64d4d42315977571 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 26 Oct 2008 22:15:47 +0000 Subject: [PATCH] * removed some 1.0 defines git-svn-id: trunk@11979 - --- ide/globdir.inc | 2 -- packages/fv/src/drivers.pas | 12 +----------- packages/fv/src/unixsmsg.inc | 12 ------------ 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/ide/globdir.inc b/ide/globdir.inc index 51e707437b..53172f6242 100644 --- a/ide/globdir.inc +++ b/ide/globdir.inc @@ -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} diff --git a/packages/fv/src/drivers.pas b/packages/fv/src/drivers.pas index 16acbf501c..6ec43e026d 100644 --- a/packages/fv/src/drivers.pas +++ b/packages/fv/src/drivers.pas @@ -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} diff --git a/packages/fv/src/unixsmsg.inc b/packages/fv/src/unixsmsg.inc index 7872ebafe8..f40f9d97a0 100644 --- a/packages/fv/src/unixsmsg.inc +++ b/packages/fv/src/unixsmsg.inc @@ -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