more header include cleanups

[deb_libnfs.git] / lib / socket.c

diff --git a/lib/socket.c b/lib/socket.c
index 6f626529be9a2c3d6c7b982a648e9edf806d2e2d..b14231e84129f2d67980a93177e4a415a2023b03 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,26 +14,32 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
 #ifdef WIN32
 #include "win32_compat.h"
 #else
-#include <unistd.h>
 #include <arpa/inet.h>
-#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #endif/*WIN32*/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_POLL_H
+#include <poll.h>
 #endif
 
-#ifdef AROS
-#include "aros_compat.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 
-#ifdef HAVE_POLL_H
-#include <poll.h>
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
 #endif
 
 #include <stdio.h>
@@ -69,7 +75,7 @@ static void set_nonblocking(int fd)
        int v = 0;
 #if defined(WIN32)
        long nonblocking=1;
-       v = ioctlsocket(fd, FIONBIO,&nonblocking);
+       v = ioctl(fd, FIONBIO, &nonblocking);
 #else
        v = fcntl(fd, F_GETFL, 0);
         fcntl(fd, F_SETFL, v | O_NONBLOCK);
@@ -149,11 +155,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-#if defined(WIN32)
-       if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
-#else
        if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
-#endif
                rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
                return -1;
        }
@@ -484,11 +486,7 @@ int rpc_disconnect(struct rpc_context *rpc, char *error)
        rpc_unset_autoreconnect(rpc);
 
        if (rpc->fd != -1) {
-#if defined(WIN32)
-               closesocket(rpc->fd);
-#else
                close(rpc->fd);
-#endif
        }
        rpc->fd  = -1;
 
@@ -520,11 +518,7 @@ static int rpc_reconnect_requeue(struct rpc_context *rpc)
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
        if (rpc->fd != -1) {
-#if defined(WIN32)
-               closesocket(rpc->fd);
-#else
                close(rpc->fd);
-#endif
        }
        rpc->fd  = -1;