paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 09:29:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

* use of special NotUnix define replaced with standard Unix

Browse Source 
git-svn-id: trunk@208 -
This commit is contained in:
Tomas Hajny 2005-06-05 12:29:47 +00:00
parent 0aac61c5c1
commit 3bb7f3e832
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fcl/inc/ssockets.pp
View File

@ -12,19 +12,6 @@
**********************************************************************} **********************************************************************}
{$MODE objfpc} {$MODE objfpc}
{$ifdef win32}
{$define notUnix}
{$endif}
{$ifdef netware}
{$define notUnix}
{$endif}
{$ifdef netwlibc}
{$define notUnix}
{$define netware}
{$endif}
unit ssockets; unit ssockets;
@ -126,7 +113,7 @@ type
Property Port : Word Read FPort; Property Port : Word Read FPort;
end; end;
{$ifndef notUnix} {$ifdef Unix}
TUnixServer = Class(TSocketServer) TUnixServer = Class(TSocketServer)
Private Private
FUnixAddr : TUnixSockAddr; FUnixAddr : TUnixSockAddr;
@ -155,7 +142,7 @@ type
Property Port : Word Read FPort; Property Port : Word Read FPort;
end; end;
{$ifndef notUnix} {$ifdef Unix}
TUnixSocket = Class(TSocketStream) TUnixSocket = Class(TSocketStream)
Private Private
@ -398,7 +385,7 @@ end;
Procedure TSocketServer.SetNonBlocking; Procedure TSocketServer.SetNonBlocking;
begin begin
{$ifndef notUnix} {$ifdef Unix}
{$ifdef ver1_0}fcntl{$else}fpfcntl{$endif}(FSocket,F_SETFL,{$ifdef ver1_0}OPEN_NONBLOCK{$else}O_NONBLOCK{$endif}); {$ifdef ver1_0}fcntl{$else}fpfcntl{$endif}(FSocket,F_SETFL,{$ifdef ver1_0}OPEN_NONBLOCK{$else}O_NONBLOCK{$endif});
{$endif} {$endif}
FNonBlocking:=True; FNonBlocking:=True;
@ -449,7 +436,7 @@ begin
L:=SizeOf(FAddr); L:=SizeOf(FAddr);
Result:=Sockets.Accept(Socket,Faddr,L); Result:=Sockets.Accept(Socket,Faddr,L);
If Result<0 then If Result<0 then
{$ifndef notUnix} {$ifdef Unix}
If SocketError={$ifdef ver1_0}Sys_EWOULDBLOCK{$else}ESysEWOULDBLOCK{$endif} then If SocketError={$ifdef ver1_0}Sys_EWOULDBLOCK{$else}ESysEWOULDBLOCK{$endif} then
Raise ESocketError.Create(seAcceptWouldBlock,[socket]) Raise ESocketError.Create(seAcceptWouldBlock,[socket])
else else
@ -460,7 +447,7 @@ end;
{ --------------------------------------------------------------------- { ---------------------------------------------------------------------
TUnixServer TUnixServer
---------------------------------------------------------------------} ---------------------------------------------------------------------}
{$ifndef notUnix} {$ifdef Unix}
Constructor TUnixServer.Create(AFileName : String); Constructor TUnixServer.Create(AFileName : String);
Var S : Longint; Var S : Longint;
@ -567,7 +554,7 @@ end;
{ --------------------------------------------------------------------- { ---------------------------------------------------------------------
TUnixSocket TUnixSocket
---------------------------------------------------------------------} ---------------------------------------------------------------------}
{$ifndef notUnix} {$ifdef Unix}
Constructor TUnixSocket.Create(ASocket : Longint); Constructor TUnixSocket.Create(ASocket : Longint);
begin begin