From 9c68645784d0127145ba5d1168300b568f5a39e4 Mon Sep 17 00:00:00 2001 From: Tomas Hajny Date: Wed, 31 Jul 2013 00:32:25 +0000 Subject: [PATCH] * more complete fix for bug #24802 (use SocketClose instead of FileClose on all platforms) git-svn-id: trunk@25197 - --- packages/fcl-net/src/fpsock.pp | 2 +- packages/fcl-net/src/ssockets.pp | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/fcl-net/src/fpsock.pp b/packages/fcl-net/src/fpsock.pp index 48ed36a8c2..f6a382b59f 100644 --- a/packages/fcl-net/src/fpsock.pp +++ b/packages/fcl-net/src/fpsock.pp @@ -209,7 +209,7 @@ Const destructor TSocketStream.Destroy; begin - FileClose(Handle); + SocketClose(Handle); inherited Destroy; end; diff --git a/packages/fcl-net/src/ssockets.pp b/packages/fcl-net/src/ssockets.pp index a0d90aa0a0..51b6c8cbdb 100644 --- a/packages/fcl-net/src/ssockets.pp +++ b/packages/fcl-net/src/ssockets.pp @@ -246,11 +246,7 @@ end; destructor TSocketStream.Destroy; begin if FSocketInitialized then - {$if defined(netware) or defined(mswindows)} CloseSocket(Handle); - {$else} - FileClose(Handle); - {$ifend} inherited Destroy; end; @@ -340,11 +336,7 @@ Procedure TSocketServer.Close; begin If FSocket<>-1 Then - {$ifdef netware} CloseSocket(FSocket); - {$else} - FileClose(FSocket); - {$endif} FSocket:=-1; end;