From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Fri, 11 Apr 2014 01:21:13 +0000 (-0700)
Subject: Merge pull request #71 from Memphiz/nolinger
X-Git-Tag: upstream/1.9.6^2~42
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=0275da678b5e0dfdb694c7287503601dcb8fa54c;hp=74b037ec4622347b518b68eb915cfb53330bede0;p=deb_libnfs.git

Merge pull request #71 from Memphiz/nolinger

[socket] - disable linger by setting SO_LINGER to 0 seconds
---

diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h
index 55f0280..0725de6 100644
--- a/include/nfsc/libnfs.h
+++ b/include/nfsc/libnfs.h
@@ -28,6 +28,9 @@
 #if defined(AROS)
 #include <sys/time.h>
 #endif
+#if defined(__APPLE__) && defined(__MACH__)
+#include <sys/time.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 6e329f9..d4a5451 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -29,6 +29,10 @@
 #include "win32_compat.h"
 #endif
 
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
@@ -49,10 +53,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
 #ifdef HAVE_POLL_H
 #include <poll.h>
 #endif