add support for fpc 2.2.4rc1

git-svn-id: file:///svnroot/lcore/trunk@60 b1de8a11-f9be-4011-bde0-cc7ace90066a

diff --git a/btime.pas b/btime.pas
index 4636a9be952cdd9dceeeacf2c4f15d9a46a72d99..9bb95502b13300569be20b37194f402ab646334b 100755 (executable)
--- a/btime.pas
+++ b/btime.pas
@@ -96,7 +96,7 @@ uses
     {$ifdef VER1_0}\r
       linux,\r
     {$else}\r
-      baseunix,unix,unixutil, {needed for 2.0.2}\r
+      baseunix,unix,unixutil,sockets, {unixutil and sockets needed by unixstuff.inc on some compiler versions}\r
     {$endif}\r
   {$else}\r
     windows,unitsettc,mmsystem,\r

diff --git a/lcore.pas b/lcore.pas
index 9061e45f2e2524f665b3579d58b113fa907fbec5..bb9eb8d606537ee4a8caf0fbd300105515e363c8 100755 (executable)
--- a/lcore.pas
+++ b/lcore.pas
@@ -26,7 +26,7 @@ interface
       {$ifdef VER1_0}\r
         linux,\r
       {$else}\r
-        baseunix,unix,unixutil,\r
+        baseunix,unix,unixutil,sockets,\r
       {$endif}\r
       fd_utils,\r
     {$endif}\r

diff --git a/lcorernd.pas b/lcorernd.pas
index 64759e83fc95d67508cae7ac4256d587cc9f4100..673860fed0eb25d52205e6500f21523828b525c5 100644 (file)
--- a/lcorernd.pas
+++ b/lcorernd.pas
@@ -137,7 +137,7 @@ uses
     {$ifdef ver1_0}\r
       linux,\r
     {$else}\r
-      baseunix,unix,unixutil,\r
+      baseunix,unix,unixutil,sockets,\r
     {$endif}\r
   {$endif}\r
   fastmd5,sysutils;\r

diff --git a/lcoreselect.pas b/lcoreselect.pas
index fea205806e585b1709e0157e61f60ff33c487f38..df2501aea9bd4222cd8667330bc55230856496d5 100755 (executable)
--- a/lcoreselect.pas
+++ b/lcoreselect.pas
@@ -21,7 +21,7 @@ uses
   {$ifdef VER1_0}\r
     linux,\r
   {$else}\r
-    baseunix,unix,unixutil,\r
+    baseunix,unix,unixutil,sockets,\r
   {$endif}\r
   fd_utils;\r
 var\r

diff --git a/lloopback.pas b/lloopback.pas
index 167aa65780f3106484823e20ad0ccc9bc03bebc8..83870d676aedd9d99157d93f7fa50ce1d57ae2be 100755 (executable)
--- a/lloopback.pas
+++ b/lloopback.pas
@@ -15,7 +15,7 @@ uses
 {$ifdef ver1_0}\r
   linux;\r
 {$else}\r
-  baseunix,unix,unixutil;  \r
+  baseunix,unix,unixutil,sockets;  \r
 {$endif}\r
 {$i unixstuff.inc}\r
 \r

diff --git a/lmessages.pas b/lmessages.pas
index d7e40082c8576e158c12cd876dc5e4677ac8ebca..a7bd01ea54ce26274b71bef51afe49d0aabfa6b9 100755 (executable)
--- a/lmessages.pas
+++ b/lmessages.pas
@@ -99,7 +99,7 @@ procedure init;
 \r
 implementation\r
 uses\r
-  baseunix,unix,lcore,unixutil,ltimevalstuff;//,safewriteln;\r
+  baseunix,unix,lcore,unixutil,ltimevalstuff,sockets;//,safewriteln;\r
 {$i unixstuff.inc}\r
 \r
 type\r

diff --git a/lsignal.pas b/lsignal.pas
index 833c56ecbbed4918b4ca51d1327b2499638c6292..ef98905665e91b1cc3a1373e849430213949071a 100755 (executable)
--- a/lsignal.pas
+++ b/lsignal.pas
@@ -14,7 +14,7 @@ interface
     {$ifdef VER1_0}\r
       linux,\r
     {$else}\r
-      baseunix,unix,unixutil,\r
+      baseunix,unix,unixutil,sockets,\r
     {$endif}\r
     classes,lcore,lloopback;\r
 \r

diff --git a/lsocket.pas b/lsocket.pas
index ddee93e8ac7d094347134b39774f66be5389d3c4..f7d40e39679925f4c9f13493bd57eb5121e435c1 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -160,6 +160,32 @@ begin
   result := inaddrsize(inaddr);\r
 end;\r
 \r
+//I used to use the system versions of these from within lsocket (which has\r
+//functions whose name clashes with them) by using sockets.* and but I can't do\r
+//that anymore since in some cases connect is now provided by unixstuff.inc\r
+//hence these wrapper functions --plugwash\r
+{$ifndef win32}\r
+  function system_Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;\r
+  begin\r
+    result := connect(sock,addr,addrlen);\r
+  end;\r
+  function system_SendTo(Sock: LongInt; const Buf;BufLen: LongInt;Flags: LongInt;var Addr;AddrLen: LongInt):LongInt;\r
+  begin\r
+    result := sendto(sock,buf,buflen,flags,addr,addrlen);\r
+  end;\r
+  function system_getpeername(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;\r
+  begin\r
+    result := getpeername(sock,addr,addrlen);\r
+  end;\r
+  function system_listen(Sock: LongInt; MaxConnect: LongInt):Boolean;\r
+  begin\r
+    result := listen(sock,maxconnect);\r
+  end;\r
+  function system_Accept(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;\r
+  begin\r
+    result := accept(sock,addr,addrlen);\r
+  end;\r
+{$endif}\r
 \r
 procedure tlsocket.realconnect;\r
 var\r
@@ -220,7 +246,7 @@ begin
         //writeln(inaddr.inaddr.port);\r
         winsock.Connect(fdhandlein,winsock.psockaddr(@inADDR)^,getaddrsize);\r
       {$else}\r
-        sockets.Connect(fdhandlein,inADDR,getaddrsize);\r
+        system_Connect(fdhandlein,inADDR,getaddrsize);\r
       {$endif}\r
       eventcore.rmasterset(fdhandlein,false);\r
       eventcore.wmasterset(fdhandleout);\r
@@ -245,6 +271,9 @@ begin
   realconnect;\r
 end;\r
 \r
+\r
+\r
+\r
 procedure tlsocket.connect;\r
 var\r
   a:integer;\r
@@ -391,7 +420,7 @@ begin
     if not udp then begin\r
       {!!! allow custom queue length? default 5}\r
       if listenqueue = 0 then listenqueue := 5;\r
-      If {$ifdef win32}winsock{$else}sockets{$endif}.Listen(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise\r
+      If {$ifdef win32}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise\r
 esocketexception.create('unable to listen');\r
       state := wsListening;\r
     end else begin\r
@@ -479,7 +508,7 @@ begin
   {$ifdef win32}\r
     result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);\r
   {$else}\r
-    result := sockets.accept(fdhandlein,fromaddr,fromaddrsize);\r
+    result := system_accept(fdhandlein,fromaddr,fromaddrsize);\r
   {$endif}\r
   //now we have accepted one request start monitoring for more again\r
   eventcore.rmasterset(fdhandlein,true);\r
@@ -495,6 +524,7 @@ begin
   end;\r
 end;\r
 \r
+\r
 function tlsocket.sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:integer):integer;\r
 var\r
   destx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute dest;\r
@@ -505,9 +535,10 @@ begin
     exit;\r
   end;\r
   {$endif}\r
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.sendto(self.fdhandleout,data^,len,0,destx,destlen);\r
+  result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx,destlen);\r
 end;\r
 \r
+\r
 function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer;\r
 var\r
   tempsrc:TInetSockAddrV;\r
@@ -523,7 +554,7 @@ begin
   end;\r
   {$endif}\r
   tempsrclen := sizeof(tempsrc);\r
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);\r
+  result := recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);\r
 \r
   {$ifdef ipv6}\r
   biniptemp := inaddrvtobinip(tempsrc);\r
@@ -636,11 +667,12 @@ begin
 end;\r
 \r
 \r
+\r
 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;\r
 var\r
   addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
 begin\r
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.getpeername(self.fdhandlein,addrx,addrlen);\r
+  result := {$ifdef win32}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);\r
 end;\r
 \r
 procedure tlsocket.getxaddrbin(var binip:tbinip);\r
@@ -654,7 +686,7 @@ begin
   {$ifdef win32}\r
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
-    sockets.getsocketname(self.fdhandlein,addr,i);\r
+    getsocketname(self.fdhandlein,addr,i);\r
   {$endif}\r
   binip := inaddrvtobinip(addr);\r
   converttov4(binip);\r
@@ -670,7 +702,7 @@ begin
   {$ifdef win32}\r
     winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
-    sockets.getpeername(self.fdhandlein,addr,i);\r
+    system_getpeername(self.fdhandlein,addr,i);\r
   {$endif}\r
 \r
   binip := inaddrvtobinip(addr);\r
@@ -705,7 +737,7 @@ begin
     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
-    sockets.getsocketname(self.fdhandlein,addr,i);\r
+    getsocketname(self.fdhandlein,addr,i);\r
 \r
   {$endif}\r
   result := inttostr(htons(addr.InAddr.port));\r
@@ -721,7 +753,7 @@ begin
     winsock.getpeername(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
-    sockets.getpeername(self.fdhandlein,addr,i);\r
+    system_getpeername(self.fdhandlein,addr,i);\r
 \r
   {$endif}\r
   result := inttostr(htons(addr.InAddr.port));\r

diff --git a/ltimevalstuff.pas b/ltimevalstuff.pas
index df0342c3448e4ad2c69c547a6b45188dc17fc844..b955ef52c888910170d887b3cb0b7f9a984e7fb6 100755 (executable)
--- a/ltimevalstuff.pas
+++ b/ltimevalstuff.pas
@@ -16,7 +16,7 @@ interface
   {$ifdef ver1_0}\r
     uses linux;\r
   {$else}\r
-    uses baseunix,unix,unixutil;\r
+    uses baseunix,unix,unixutil,sockets;\r
   {$endif}\r
 {$endif}\r
                                 \r

diff --git a/unitfork.pas b/unitfork.pas
index cd008dae2c1e2390a8ec3f23ad0ecae531aa7af7..019695bfb796ea852173ef290476c5e926bab579 100755 (executable)
--- a/unitfork.pas
+++ b/unitfork.pas
@@ -17,7 +17,7 @@ uses
   {$ifdef VER1_0}\r
     linux,\r
   {$else}\r
-    baseunix,unix,unixutil,\r
+    baseunix,unix,unixutil,sockets,\r
   {$endif}\r
   sysutils;\r
 \r

diff --git a/unixstuff.inc b/unixstuff.inc
index 89c96f2ce84c6615939eb2b4e6779d9668d581e1..120f8f1db3a2748a325e5ec1e069b43d2a3c40d7 100755 (executable)
--- a/unixstuff.inc
+++ b/unixstuff.inc
@@ -50,6 +50,43 @@
          if (p=nil) or (p^=nil) then exit;\r
          fpexecv(p^,p);\r
        end;\r
+       function SendTo(Sock: LongInt; const Buf;BufLen: LongInt;Flags: LongInt;var Addr;AddrLen: LongInt):LongInt;
+       begin
+         result := fpsendto(sock,@buf,buflen,flags,@addr,addrlen);
+       end;
+       function RecvFrom(Sock: LongInt;var Buf;Buflen: LongInt;Flags: LongInt;var Addr;var addrlen: Longint):LongInt;
+       begin
+         result := fprecvfrom(sock,@buf,buflen,flags,@addr,@addrlen);
+       end;
+       {$define socket := fpsocket}
+       function Bind(Sock: LongInt;const Addr;AddrLen: LongInt):Boolean;
+       begin
+         result := fpbind(sock,@addr,addrlen) = 0;
+       end;
+       function SetSocketOptions(Sock: LongInt;Level: LongInt;OptName: LongInt;const OptVal;optlen: LongInt):LongInt;
+       begin
+         result := fpsetsockopt(sock,level,optname,@optval,optlen);
+       end;
+       function Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;
+       begin
+         result := fpconnect(sock,@addr,addrlen) >= 0;
+       end;
+        function listen(Sock: LongInt;MaxConnect: LongInt):Boolean;
+        begin
+          result := fplisten(sock,maxconnect) = 0;
+        end; 
+        function GetPeerName(Sock: LongInt; var Addr;var Addrlen: LongInt):LongInt;
+        begin
+          result := fpgetpeername(sock,@addr,@addrlen);
+        end;
+        function GetSocketName(Sock: LongInt; var Addr;var Addrlen: LongInt):LongInt;
+        begin
+          result := fpgetpeername(sock,@addr,@addrlen);
+        end;
+        function Accept(Sock: LongInt; var Addr; var Addrlen: LongInt):LongInt;
+        begin
+          result := fpaccept(sock,@addr,@addrlen);
+        end;
       {$endif}\r
     {$endif}\r
     {$ifdef ver2_0}\r