From: David Elliott <dfe@tgwbd.org>
Date: Wed, 14 Jan 2004 02:42:38 +0000 (+0000)
Subject: * Revert Darwin specific changes to GSocket_destroy.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9d8278ea644f99851bcfa54fa84e7313e51f5610?ds=inline

* Revert Darwin specific changes to GSocket_destroy.
* In GSocket_Shutdown do not call close on Darwin since gsockosx.c will do
  it during CFInvalidate which will be called from GSocket_Disable_Events


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 396a93641d..dc6c7e5702 100644
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -261,7 +261,10 @@ GSocket *GSocket_new(void)
 void GSocket_close(GSocket *socket)
 {
     _GSocket_Disable_Events(socket);
+// gsockosx.c calls CFSocketInvalidate which closes the socket for us
+#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
     close(socket->m_fd);
+#endif
     socket->m_fd = INVALID_SOCKET;
 }
 
@@ -269,20 +272,12 @@ void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);
 
-  /* When using CFSocket we MUST invalidate before closing the fd */
-#ifdef __DARWIN__
-  /* Per-socket GUI-specific cleanup */
-  _GSocket_GUI_Destroy_Socket(socket);
-#endif
-
   /* Check that the socket is really shutdowned */
   if (socket->m_fd != INVALID_SOCKET)
     GSocket_Shutdown(socket);
 
-#ifndef __DARWIN__
   /* Per-socket GUI-specific cleanup */
   _GSocket_GUI_Destroy_Socket(socket);
-#endif
 
   /* Destroy private addresses */
   if (socket->m_local)