X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fshared%2Futils.pas;h=c0ba824a9615188a05e25f4b0ac835f22bef2ffd;hp=26150aa3f2e4627706b19df003439de4c7d4a045;hb=aaf68058b78caa801c4ffc1805cf204921059eb7;hpb=a1338c3de8d2613ba82d89921630df1ae7b183d0 diff --git a/src/shared/utils.pas b/src/shared/utils.pas index 26150aa..c0ba824 100644 --- a/src/shared/utils.pas +++ b/src/shared/utils.pas @@ -207,7 +207,7 @@ function nmin (a, b: Int64): Int64; inline; overload; function nmin (a, b: UInt64): UInt64; inline; overload; function nmin (a, b: Single): Single; inline; overload; function nmin (a, b: Double): Double; inline; overload; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} +{$IFDEF FPC_HAS_TYPE_EXTENDED} function nmin (a, b: Extended): Extended; inline; overload; {$ENDIF} @@ -221,7 +221,7 @@ function nmax (a, b: Int64): Int64; inline; overload; function nmax (a, b: UInt64): UInt64; inline; overload; function nmax (a, b: Single): Single; inline; overload; function nmax (a, b: Double): Double; inline; overload; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} +{$IFDEF FPC_HAS_TYPE_EXTENDED} function nmax (a, b: Extended): Extended; inline; overload; {$ENDIF} function nclamp (v, a, b: Byte): Byte; inline; overload; @@ -234,7 +234,7 @@ function nclamp (v, a, b: Int64): Int64; inline; overload; function nclamp (v, a, b: UInt64): UInt64; inline; overload; function nclamp (v, a, b: Single): Single; inline; overload; function nclamp (v, a, b: Double): Double; inline; overload; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} +{$IFDEF FPC_HAS_TYPE_EXTENDED} function nclamp (v, a, b: Extended): Extended; inline; overload; {$ENDIF} @@ -1547,7 +1547,7 @@ function nmin (a, b: Int64): Int64; inline; overload; begin if (a < b) then resu function nmin (a, b: UInt64): UInt64; inline; overload; begin if (a < b) then result := a else result := b; end; function nmin (a, b: Single): Single; inline; overload; begin if (a < b) then result := a else result := b; end; function nmin (a, b: Double): Double; inline; overload; begin if (a < b) then result := a else result := b; end; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} +{$IFDEF FPC_HAS_TYPE_EXTENDED} function nmin (a, b: Extended): Extended; inline; overload; begin if (a < b) then result := a else result := b; end; {$ENDIF} @@ -1561,7 +1561,7 @@ function nmax (a, b: Int64): Int64; inline; overload; begin if (a > b) then resu function nmax (a, b: UInt64): UInt64; inline; overload; begin if (a > b) then result := a else result := b; end; function nmax (a, b: Single): Single; inline; overload; begin if (a > b) then result := a else result := b; end; function nmax (a, b: Double): Double; inline; overload; begin if (a > b) then result := a else result := b; end; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} +{$IFDEF FPC_HAS_TYPE_EXTENDED} function nmax (a, b: Extended): Extended; inline; overload; begin if (a > b) then result := a else result := b; end; {$ENDIF} @@ -1575,7 +1575,7 @@ function nclamp (v, a, b: Int64): Int64; inline; overload; begin if (v < a) then function nclamp (v, a, b: UInt64): UInt64; inline; overload; begin if (v < a) then result := a else if (v > b) then result := b else result := v; end; function nclamp (v, a, b: Single): Single; inline; overload; begin if (v < a) then result := a else if (v > b) then result := b else result := v; end; function nclamp (v, a, b: Double): Double; inline; overload; begin if (v < a) then result := a else if (v > b) then result := b else result := v; end; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} +{$IFDEF FPC_HAS_TYPE_EXTENDED} function nclamp (v, a, b: Extended): Extended; inline; overload; begin if (v < a) then result := a else if (v > b) then result := b else result := v; end; {$ENDIF}