From 533c7161fc06f3e78f977a5b0692150213fa2f7e Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Mon, 6 Sep 1999 19:06:46 +0000 Subject: [PATCH] Moved gsockunx.h from src/unix to include/wx/unix Added include/wx/unix/gsockunx.h to Makefile.in git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 3 ++- {src => include/wx}/unix/gsockunx.h | 0 src/unix/gsocket.c | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) rename {src => include/wx}/unix/gsockunx.h (100%) diff --git a/Makefile.in b/Makefile.in index 146932dbd4..dee09687b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -516,7 +516,8 @@ MSW_HEADERS = \ msw/xpmhand.h UNIX_HEADERS = \ - unix/execute.h + unix/execute.h \ + unix/gsockunx.h GENERIC_HEADERS = \ generic/caret.h \ diff --git a/src/unix/gsockunx.h b/include/wx/unix/gsockunx.h similarity index 100% rename from src/unix/gsockunx.h rename to include/wx/unix/gsockunx.h diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index de516f4506..3174b57a7a 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -43,7 +43,7 @@ #include #include "wx/gsocket.h" -#include "gsockunx.h" +#include "wx/unix/gsockunx.h" #ifndef SOCKLEN_T @@ -161,9 +161,7 @@ void GSocket_Shutdown(GSocket *socket) /* If socket has been created, we shutdown it */ if (socket->m_fd != -1) { - /* Only oriented connection should be shutdowned */ - if (socket->m_oriented) - shutdown(socket->m_fd, 2); + shutdown(socket->m_fd, 2); close(socket->m_fd); socket->m_fd = -1; } -- 2.45.2