2
0
Эх сурвалжийг харах

- Don't compile fpc_abs_real and fpc_sqr_real if they are already defined (Mantis #25342).

git-svn-id: trunk@27408 -
sergei 11 жил өмнө
parent
commit
fff45fa1d3

+ 4 - 0
rtl/arm/math.inc

@@ -15,6 +15,7 @@
  **********************************************************************}
  **********************************************************************}
 
 
 {$if defined(FPUFPA) or defined(FPUFPA10) or defined(FPUFPA11) or defined(FPUVFPV2) or defined(FPUVFPV3) or defined(FPUVFPV3_D16)}
 {$if defined(FPUFPA) or defined(FPUFPA10) or defined(FPUFPA11) or defined(FPUVFPV2) or defined(FPUVFPV3) or defined(FPUVFPV3_D16)}
+    {$ifndef FPC_SYSTEM_HAS_ABS}
     {$define FPC_SYSTEM_HAS_ABS}
     {$define FPC_SYSTEM_HAS_ABS}
     function fpc_abs_real(d : ValReal) : ValReal;compilerproc;
     function fpc_abs_real(d : ValReal) : ValReal;compilerproc;
     begin
     begin
@@ -22,6 +23,8 @@
       runerror(207);
       runerror(207);
       result:=0;
       result:=0;
     end;
     end;
+    {$endif FPC_SYSTEM_HAS_ABS}
+    {$ifndef FPC_SYSTEM_HAS_SQR}
     {$define FPC_SYSTEM_HAS_SQR}
     {$define FPC_SYSTEM_HAS_SQR}
     function fpc_sqr_real(d : ValReal) : ValReal;compilerproc;
     function fpc_sqr_real(d : ValReal) : ValReal;compilerproc;
     begin
     begin
@@ -29,6 +32,7 @@
       runerror(207);
       runerror(207);
       result:=0;
       result:=0;
     end;
     end;
+    {$endif FPC_SYSTEM_HAS_SQR}
     {$ifndef FPC_SYSTEM_HAS_SQRT}
     {$ifndef FPC_SYSTEM_HAS_SQRT}
     {$define FPC_SYSTEM_HAS_SQRT}
     {$define FPC_SYSTEM_HAS_SQRT}
     function fpc_sqrt_real(d : ValReal) : ValReal;compilerproc;
     function fpc_sqrt_real(d : ValReal) : ValReal;compilerproc;