Merge pull request #203 from LongDirtyAnimAlf/master

fix some issues on Linux ARM
synopse · May 27, 2019 · 4769bbe · 4769bbe
2 parents 727381e + 6bb6613
commit 4769bbe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SynFPCSock.pas b/SynFPCSock.pas
@@ -508,7 +508,7 @@ procedure ResolveNameToIP(const Name: AnsiString; Family, SockProtocol, SockType
 
 type
   /// polling request data structure for poll()
-  TPollFD = packed record
+  TPollFD = {packed} record
     /// file descriptor to poll
     fd: integer;
     /// types of events poller cares about
@@ -563,7 +563,7 @@   TEPollData = record
   PEPollData = ^TEPollData;
 
   /// epoll descriptor data structure
-  TEPollEvent = packed record
+  TEPollEvent = {$ifdef CPU64}packed{$endif} record
     events: cardinal;
     data: TEpollData;
   end;

diff --git a/SynFPCTypInfo.pas b/SynFPCTypInfo.pas
@@ -179,7 +179,7 @@ function AlignTypeData(p: Pointer): Pointer;
 function GetFPCAlignPtr(P: pointer): pointer;
 begin
   result := TypInfo.AlignTypeData(P+2+Length(PTypeInfo(P)^.Name));
-  Dec(PtrUInt(result),SizeOf(pointer));
+  Dec(PtrUInt(result),2*SizeOf(pointer));
 end;
 {$endif FPC_REQUIRES_PROPER_ALIGNMENT}