Browse Source

* patch by Joe care to make fv more 64 Bit save, resolves #37772

git-svn-id: trunk@46893 -
(cherry picked from commit b596b71130a1b18e08388c0d5853968043e0deb2)
florian 4 years ago
parent
commit
7d3534de20
3 changed files with 3 additions and 3 deletions
  1. 1 1
      packages/fv/src/sysmsg.pas
  2. 1 1
      packages/fv/src/views.pas
  3. 1 1
      packages/fv/src/w32smsg.inc

+ 1 - 1
packages/fv/src/sysmsg.pas

@@ -104,7 +104,7 @@ begin
    begin
    begin
      PendingSystemTail^:=SystemEvent;
      PendingSystemTail^:=SystemEvent;
      inc(PendingSystemTail);
      inc(PendingSystemTail);
-     if longint(PendingSystemTail)=longint(@PendingSystemEvent)+sizeof(PendingSystemEvent) then
+     if PtrUInt(PendingSystemTail)=PtrUInt(@PendingSystemEvent)+sizeof(PendingSystemEvent) then
       PendingSystemTail:=@PendingSystemEvent;
       PendingSystemTail:=@PendingSystemEvent;
        inc(PendingSystemEvents);
        inc(PendingSystemEvents);
    end;
    end;

+ 1 - 1
packages/fv/src/views.pas

@@ -2112,7 +2112,7 @@ BEGIN
      Tp := Last;                                      { Set temporary ptr }
      Tp := Last;                                      { Set temporary ptr }
      Repeat
      Repeat
        Tp := Tp^.Next;                                { Get next view }
        Tp := Tp^.Next;                                { Get next view }
-       IF Byte(Longint(CallPointerMethodLocal(P,
+         IF Byte(PtrUInt(CallPointerMethodLocal(P,
          { On most systems, locals are accessed relative to base pointer,
          { On most systems, locals are accessed relative to base pointer,
            but for MIPS cpu, they are accessed relative to stack pointer.
            but for MIPS cpu, they are accessed relative to stack pointer.
            This needs adaptation for so low level routines,
            This needs adaptation for so low level routines,

+ 1 - 1
packages/fv/src/w32smsg.inc

@@ -145,7 +145,7 @@ begin
   EnterCriticalSection(ChangeSystemEvents);
   EnterCriticalSection(ChangeSystemEvents);
   SystemEvent:=PendingSystemHead^;
   SystemEvent:=PendingSystemHead^;
   inc(PendingSystemHead);
   inc(PendingSystemHead);
-  if ptrint(PendingSystemHead)=ptrint(@PendingSystemEvent)+sizeof(PendingSystemEvent) then
+  if PtrUInt(PendingSystemHead)=PtrUInt(@PendingSystemEvent)+sizeof(PendingSystemEvent) then
    PendingSystemHead:=@PendingSystemEvent;
    PendingSystemHead:=@PendingSystemEvent;
   dec(PendingSystemEvents);
   dec(PendingSystemEvents);
   LastSystemEvent:=SystemEvent;
   LastSystemEvent:=SystemEvent;