Explorar o código

* cleanup of 2.7.0 defines

florian %!s(int64=3) %!d(string=hai) anos
pai
achega
ff3acfb8cd

+ 0 - 2
compiler/aarch64/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = type extended;

+ 0 - 2
compiler/arm/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = type extended;

+ 0 - 2
compiler/avr/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = type extended;

+ 2 - 2
compiler/compiler.pas

@@ -36,7 +36,7 @@ uses
 {$ifdef WATCOM}
   emu387,
 {$endif WATCOM}
-{$if defined(unix) and (FPC_FULLVERSION>20700)}
+{$if defined(unix)}
   { system code page stuff for unix }
   unixcp,
   fpwidestring,
@@ -197,7 +197,7 @@ procedure InitCompiler(const cmd:TCmdStr);
 begin
   if CompilerInited then
    DoneCompiler;
-{$if defined(unix) and (FPC_FULLVERSION>20700)}
+{$if defined(unix)}
   { Set default code page for ansistrings on unix-like systems }
   DefaultSystemCodePage:=GetSystemCodePage;
 {$endif}

+ 0 - 3
compiler/cresstr.pas

@@ -32,9 +32,6 @@ implementation
 
 uses
    SysUtils,
-{$if FPC_FULLVERSION<20700}
-   ccharset,
-{$endif}
    cclasses,widestr,
    cutils,globtype,globals,systems,
    symbase,symconst,symtype,symdef,symsym,symtable,

+ 0 - 2
compiler/generic/cpuinfo.pas

@@ -24,13 +24,11 @@ Interface
 
 Type
    bestreal = extended;
-{$if FPC_FULLVERSION>20700}
 {$ifdef FPC_HAS_TYPE_EXTENDED}
    bestrealrec = TExtended80Rec;
 {$else}
    bestrealrec = TDoubleRec;
 {$endif}
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = type extended;

+ 0 - 2
compiler/i386/cpuinfo.pas

@@ -30,9 +30,7 @@ Interface
 
 Type
    bestreal = extended;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TExtended80Rec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = extended;

+ 0 - 2
compiler/i8086/cpuinfo.pas

@@ -30,9 +30,7 @@ Interface
 
 Type
    bestreal = extended;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TExtended80Rec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = extended;

+ 0 - 2
compiler/jvm/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = extended;

+ 0 - 2
compiler/m68k/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = extended;

+ 0 - 2
compiler/mips/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = type double;

+ 2 - 2
compiler/nadd.pas

@@ -1121,7 +1121,7 @@ implementation
               end;
           end;
 
-{$if (FPC_FULLVERSION>20700) and not defined(FPC_SOFT_FPUX80)}
+{$if not defined(FPC_SOFT_FPUX80)}
         { bestrealrec is 2.7.1+ only }
 
         { replace .../const by a multiplication, but only if fastmath is enabled or
@@ -1170,7 +1170,7 @@ implementation
             else
               ;
           end;
-{$endif FPC_FULLVERSION>20700}
+{$endif not defined(FPC_SOFT_FPUX80)}
 
         { first, we handle widestrings, so we can check later for }
         { stringconstn only                                       }

+ 1 - 1
compiler/options.pas

@@ -95,7 +95,7 @@ implementation
 
 uses
   widestr,
-  {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif},
+  charset,
   SysUtils,
   version,
   cutils,cmsgs,

+ 0 - 2
compiler/powerpc/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = extended;

+ 0 - 2
compiler/powerpc64/cpuinfo.pas

@@ -23,9 +23,7 @@ uses
 
 type
   bestreal = double;
-{$if FPC_FULLVERSION>20700}
   bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
   ts32real = single;
   ts64real = double;
   ts80real = extended;

+ 0 - 2
compiler/riscv32/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = extended;

+ 0 - 2
compiler/riscv64/cpuinfo.pas

@@ -23,9 +23,7 @@ uses
 
 type
   bestreal = double;
-{$if FPC_FULLVERSION>20700}
   bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
   ts32real = single;
   ts64real = double;
   ts80real = extended;

+ 1 - 5
compiler/scanner.pas

@@ -291,11 +291,7 @@ implementation
       cpuinfo,
       fmodule,fppu,
       { this is needed for $I %CURRENTROUTINE%}
-      procinfo
-{$if FPC_FULLVERSION<20700}
-      ,ccharset
-{$endif}
-      ;
+      procinfo;
 
     var
       { dictionaries with the supported directives }

+ 0 - 2
compiler/sparc/cpuinfo.pas

@@ -30,9 +30,7 @@ uses
 
 type
   bestreal = double;
-{$if FPC_FULLVERSION>20700}
   bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
   ts32real = single;
   ts64real = double;
   ts80real = extended;

+ 0 - 2
compiler/sparc64/cpuinfo.pas

@@ -30,9 +30,7 @@ uses
 
 type
   bestreal = double;
-{$if FPC_FULLVERSION>20700}
   bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
   ts32real = single;
   ts64real = double;
   ts80real = extended;

+ 0 - 2
compiler/wasm32/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = extended;

+ 0 - 2
compiler/x86_64/cpuinfo.pas

@@ -30,13 +30,11 @@ Interface
 
 Type
    bestreal = extended;
-{$if FPC_FULLVERSION>20700}
 {$ifdef FPC_HAS_TYPE_EXTENDED}
    bestrealrec = TExtended80Rec;
 {$else}
    bestrealrec = TDoubleRec;
 {$endif}
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = extended;

+ 0 - 2
compiler/z80/cpuinfo.pas

@@ -23,9 +23,7 @@ Interface
 
 Type
    bestreal = double;
-{$if FPC_FULLVERSION>20700}
    bestrealrec = TDoubleRec;
-{$endif FPC_FULLVERSION>20700}
    ts32real = single;
    ts64real = double;
    ts80real = type extended;