diff --git a/components/exctrls/source/exeditctrls.pas b/components/exctrls/source/exeditctrls.pas
index f259e0b9a..576f9f0df 100644
--- a/components/exctrls/source/exeditctrls.pas
+++ b/components/exctrls/source/exeditctrls.pas
@@ -57,9 +57,9 @@ type
     procedure EditKeyPress(var Key: char); override;
     function SafeInc(AValue: Currency): Currency; override;
     function SafeDec(AValue: Currency): Currency; override;
-    {$IF FPC_FullVersion=30202}{$IFDEF Win64}
+    {$IF FPC_FullVersion>=30202}
     function SameValue(AValue1, AValue2: Currency): Boolean; override;
-    {$ENDIF}{$IFEND}
+    {$ENDIF}
     function TextIsNumber(const S: String; out ANumber: Currency): Boolean; override;
     function TryExtractCurrency(AText: String; out AValue: Currency;
       const AFormatSettings: TFormatSettings): Boolean;
@@ -351,12 +351,12 @@ begin
 end;
 
 // Workaround for https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/39490
-{$IF FPC_FullVersion=30202}{$IFDEF Win64}
+{$IF FPC_FullVersion>=30202}
 function TCustomCurrSpinEditEx.SameValue(AValue1, AValue2: Currency): Boolean;
 begin
   Result := (AValue1 = AValue2);
 end;
-{$ENDIF}{$IFEND}
+{$ENDIF}
 
 procedure TCustomCurrSpinEditEx.SetCurrencyFormat(AValue: TSpinEditCurrencyFormat);
 begin