mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-12 03:46:10 +02:00
* min/max must check the compiler capabilities
This commit is contained in:
parent
75fc66fdd4
commit
a15ad1e3a3
@ -119,12 +119,18 @@ function Min(a, b: Cardinal): Cardinal;
|
|||||||
function Max(a, b: Cardinal): Cardinal;
|
function Max(a, b: Cardinal): Cardinal;
|
||||||
function Min(a, b: Int64): Int64;
|
function Min(a, b: Int64): Int64;
|
||||||
function Max(a, b: Int64): Int64;
|
function Max(a, b: Int64): Int64;
|
||||||
|
{$ifdef FPC_HAS_TYPE_SINGLE}
|
||||||
function Min(a, b: Single): Single;
|
function Min(a, b: Single): Single;
|
||||||
function Max(a, b: Single): Single;
|
function Max(a, b: Single): Single;
|
||||||
|
{$endif FPC_HAS_TYPE_SINGLE}
|
||||||
|
{$ifdef FPC_HAS_TYPE_DOUBLE}
|
||||||
function Min(a, b: Double): Double;
|
function Min(a, b: Double): Double;
|
||||||
function Max(a, b: Double): Double;
|
function Max(a, b: Double): Double;
|
||||||
|
{$endif FPC_HAS_TYPE_DOUBLE}
|
||||||
|
{$ifdef FPC_HAS_TYPE_EXTENDED}
|
||||||
function Min(a, b: Extended): Extended;
|
function Min(a, b: Extended): Extended;
|
||||||
function Max(a, b: Extended): Extended;
|
function Max(a, b: Extended): Extended;
|
||||||
|
{$endif FPC_HAS_TYPE_EXTENDED}
|
||||||
|
|
||||||
{ angle conversion }
|
{ angle conversion }
|
||||||
|
|
||||||
@ -933,6 +939,7 @@ begin
|
|||||||
Result := b;
|
Result := b;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
{$ifdef FPC_HAS_TYPE_SINGLE}
|
||||||
function Min(a, b: Single): Single;
|
function Min(a, b: Single): Single;
|
||||||
begin
|
begin
|
||||||
if a < b then
|
if a < b then
|
||||||
@ -948,7 +955,9 @@ begin
|
|||||||
else
|
else
|
||||||
Result := b;
|
Result := b;
|
||||||
end;
|
end;
|
||||||
|
{$endif FPC_HAS_TYPE_SINGLE}
|
||||||
|
|
||||||
|
{$ifdef FPC_HAS_TYPE_DOUBLE}
|
||||||
function Min(a, b: Double): Double;
|
function Min(a, b: Double): Double;
|
||||||
begin
|
begin
|
||||||
if a < b then
|
if a < b then
|
||||||
@ -964,7 +973,9 @@ begin
|
|||||||
else
|
else
|
||||||
Result := b;
|
Result := b;
|
||||||
end;
|
end;
|
||||||
|
{$endif FPC_HAS_TYPE_DOUBLE}
|
||||||
|
|
||||||
|
{$ifdef FPC_HAS_TYPE_EXTENDED}
|
||||||
function Min(a, b: Extended): Extended;
|
function Min(a, b: Extended): Extended;
|
||||||
begin
|
begin
|
||||||
if a < b then
|
if a < b then
|
||||||
@ -980,6 +991,7 @@ begin
|
|||||||
else
|
else
|
||||||
Result := b;
|
Result := b;
|
||||||
end;
|
end;
|
||||||
|
{$endif FPC_HAS_TYPE_EXTENDED}
|
||||||
|
|
||||||
{ include cpu specific stuff }
|
{ include cpu specific stuff }
|
||||||
{$i mathu.inc}
|
{$i mathu.inc}
|
||||||
@ -987,7 +999,10 @@ end;
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.10 2003-04-24 09:21:59 florian
|
Revision 1.11 2003-04-24 09:38:12 florian
|
||||||
|
* min/max must check the compiler capabilities
|
||||||
|
|
||||||
|
Revision 1.10 2003/04/24 09:21:59 florian
|
||||||
+ moved cpu dependend code to mathuh.inc and mathu.inc
|
+ moved cpu dependend code to mathuh.inc and mathu.inc
|
||||||
|
|
||||||
Revision 1.9 2003/01/03 20:34:02 peter
|
Revision 1.9 2003/01/03 20:34:02 peter
|
||||||
|
Loading…
Reference in New Issue
Block a user