Skip to content

Commit 534d63b

Browse files
committed
removed use of PUREPASCAL define
1 parent db2ffaa commit 534d63b

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

Source/Base/Spring.pas

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4761,7 +4761,7 @@ procedure TInitTable.TManagedObjectField.InitializeValue(instance: Pointer);
47614761
{$REGION 'TInitTable.TManagedInterfaceField'}
47624762

47634763
procedure InvokeImplGetter(const self: TObject; implGetter: NativeUInt; var result: IInterface);
4764-
{$IFDEF PUREPASCAL}
4764+
{$IFNDEF CPUX86}
47654765
type
47664766
{$IF defined(MSWINDOWS) or defined(OSX32)}
47674767
TGetProc = procedure (const self: TObject; var result: IInterface);
@@ -4787,7 +4787,6 @@ procedure InvokeImplGetter(const self: TObject; implGetter: NativeUInt; var resu
47874787
end;
47884788
end;
47894789
{$ELSE}
4790-
{$IFDEF CPUX86}
47914790
asm
47924791
xchg edx,ecx
47934792
cmp ecx,PROPSLOT_FIELD
@@ -4810,7 +4809,6 @@ procedure InvokeImplGetter(const self: TObject; implGetter: NativeUInt; var resu
48104809
jmp System.@IntfCopy
48114810
end;
48124811
{$ENDIF}
4813-
{$ENDIF}
48144812

48154813
constructor TInitTable.TManagedInterfaceField.Create(offset: Integer;
48164814
fieldType: PTypeInfo; cls: TClass; const factory: TFunc<PTypeInfo,Pointer>;
@@ -8868,7 +8866,7 @@ class function Weak.GetIsAlive(const reference): Boolean;
88688866
end;
88698867

88708868
class procedure Weak.GetTarget(const reference; var result; kind: TTypeKind);
8871-
{$IFDEF PUREPASCAL}
8869+
{$IFNDEF CPUX86}
88728870
var
88738871
p: Pointer;
88748872
begin

Source/Spring.inc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@
3232

3333
{$T-,X+,H+,B-}
3434

35-
{$IF Defined(CPUX86) and Defined(ASSEMBLER)}
36-
{$DEFINE X86ASMRTL}
37-
{$ELSE}
38-
{$DEFINE PUREPASCAL}
39-
{$IFEND}
40-
4135
{$IFDEF SUPPORTS_LEGACYIFEND}
4236
{$LEGACYIFEND ON}
4337
{$ENDIF}

0 commit comments

Comments
 (0)