Issue bvarga#17 (bvarga#29)

* Correct zmq assertion failure for 64-bit TZMQPoller.Poll bvarga#17 * Resolve FPC 64-bit compilation issue
AndrzejZalewski · Jan 3, 2019 · bcdef1f · bcdef1f
1 parent 8c4126a
commit bcdef1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/zmq.pas b/zmq.pas
@@ -382,7 +382,11 @@ function zmq_socket_monitor( s: Pointer; addr: PAnsiChar; events: Integer ): Int
 type
   pollitem_t = record
     socket: Pointer;
-    fd: Integer; // TSocket???
+    {$ifdef WIN64}
+    fd: Int64; // TSocket???
+    {$else}
+    fd: Cardinal;
+    {$endif}
     events: Word;
     revents: Word;
   end;

diff --git a/zmqapi.pas b/zmqapi.pas
@@ -1902,7 +1902,11 @@ procedure TZMQSocket.RegisterMonitor( proc: TZMQMonitorProc; events: TZMQMonitor
   {$ifdef UNIX}
   tid: QWord;
   {$else}
-  tid: Cardinal;
+    {$ifdef FPC}
+    tid: SizeUInt;
+    {$else}
+    tid: Cardinal;
+    {$endif}
   {$endif}
 begin
   if fMonitorRec <> nil then