From 3bb7f3e8325bed6ea819468adea5480dd426720a Mon Sep 17 00:00:00 2001 From: Tomas Hajny Date: Sun, 5 Jun 2005 12:29:47 +0000 Subject: [PATCH] * use of special NotUnix define replaced with standard Unix git-svn-id: trunk@208 - --- fcl/inc/ssockets.pp | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/fcl/inc/ssockets.pp b/fcl/inc/ssockets.pp index 77941012be..c32d33b7d2 100644 --- a/fcl/inc/ssockets.pp +++ b/fcl/inc/ssockets.pp @@ -12,19 +12,6 @@ **********************************************************************} {$MODE objfpc} -{$ifdef win32} - {$define notUnix} -{$endif} - -{$ifdef netware} - {$define notUnix} -{$endif} - -{$ifdef netwlibc} - {$define notUnix} - {$define netware} -{$endif} - unit ssockets; @@ -126,7 +113,7 @@ type Property Port : Word Read FPort; end; -{$ifndef notUnix} +{$ifdef Unix} TUnixServer = Class(TSocketServer) Private FUnixAddr : TUnixSockAddr; @@ -155,7 +142,7 @@ type Property Port : Word Read FPort; end; -{$ifndef notUnix} +{$ifdef Unix} TUnixSocket = Class(TSocketStream) Private @@ -398,7 +385,7 @@ end; Procedure TSocketServer.SetNonBlocking; begin -{$ifndef notUnix} +{$ifdef Unix} {$ifdef ver1_0}fcntl{$else}fpfcntl{$endif}(FSocket,F_SETFL,{$ifdef ver1_0}OPEN_NONBLOCK{$else}O_NONBLOCK{$endif}); {$endif} FNonBlocking:=True; @@ -449,7 +436,7 @@ begin L:=SizeOf(FAddr); Result:=Sockets.Accept(Socket,Faddr,L); If Result<0 then -{$ifndef notUnix} +{$ifdef Unix} If SocketError={$ifdef ver1_0}Sys_EWOULDBLOCK{$else}ESysEWOULDBLOCK{$endif} then Raise ESocketError.Create(seAcceptWouldBlock,[socket]) else @@ -460,7 +447,7 @@ end; { --------------------------------------------------------------------- TUnixServer ---------------------------------------------------------------------} -{$ifndef notUnix} +{$ifdef Unix} Constructor TUnixServer.Create(AFileName : String); Var S : Longint; @@ -567,7 +554,7 @@ end; { --------------------------------------------------------------------- TUnixSocket ---------------------------------------------------------------------} -{$ifndef notUnix} +{$ifdef Unix} Constructor TUnixSocket.Create(ASocket : Longint); begin