Bläddra i källkod

Completely disable Round functions if FPUNONE is defined, to fix avr builds without flaot support

git-svn-id: trunk@43305 -
pierre 5 år sedan
förälder
incheckning
d80734b412
1 ändrade filer med 4 tillägg och 4 borttagningar
  1. 4 4
      rtl/inc/iso7185.pp

+ 4 - 4
rtl/inc/iso7185.pp

@@ -52,10 +52,9 @@ unit iso7185;
 
     Function Eof(var f:TypedFile): Boolean;
 
-{$ifdef FPC_CURRENCY_IS_INT64}
 {$ifndef FPUNONE}
+{$ifdef FPC_CURRENCY_IS_INT64}
     function round(c : currency) : int64;
-{$endif FPUNONE}
 {$ifndef cpujvm}
     function round(c : comp) : int64;
 {$else not cpujvm}
@@ -63,6 +62,7 @@ unit iso7185;
 {$endif not cpujvm}
 {$endif FPC_CURRENCY_IS_INT64}
     function Round(d : ValReal) : int64;
+{$endif FPUNONE}
 
   implementation
 
@@ -250,8 +250,8 @@ unit iso7185;
       End;
 
 
-{$ifdef FPC_CURRENCY_IS_INT64}
 {$ifndef FPUNONE}
+{$ifdef FPC_CURRENCY_IS_INT64}
     function round(c : currency) : int64;
       begin
         if c>=0.0 then
@@ -259,7 +259,6 @@ unit iso7185;
         else
           Round:=Trunc(c-0.5);
       end;
-{$endif FPUNONE}
 
 
 {$ifndef cpujvm}
@@ -289,6 +288,7 @@ unit iso7185;
         else
           Round:=Trunc(d-0.5);
       end;
+{$endif FPUNONE}
 
 begin
   { we shouldn't do this because it might confuse user programs, but for now it