d/iperf3-tls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added an ifdef for Mac OS/X version, to better protect the sendfile code.

Browse Source
This commit is contained in:
Jef Poskanzer 2013-06-07 08:16:24 -07:00
parent 5ec1d758f1
commit c39c4f503f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/net.c
View File

@ -26,7 +26,7 @@
#ifdef __FreeBSD__
#include <sys/uio.h>
#else
#if defined(__APPLE__) && defined(__MACH__) /* OS X */
#if defined(__APPLE__) && defined(__MACH__) && defined(MAC_OS_X_VERSION_10_6) /* OS X */
#include <sys/uio.h>
#endif
#endif
@ -196,7 +196,7 @@ has_sendfile(void)
#ifdef __FreeBSD__
return 1;
#else
#if defined(__APPLE__) && defined(__MACH__) /* OS X */
#if defined(__APPLE__) && defined(__MACH__) && defined(MAC_OS_X_VERSION_10_6) /* OS X */
return 1;
#else
return 0;
@ -214,7 +214,7 @@ int
Nsendfile(int fromfd, int tofd, const char *buf, size_t count)
{
off_t offset;
#if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__))
#if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__) && defined(MAC_OS_X_VERSION_10_6))
off_t sent;
#endif
register size_t nleft;
@ -231,7 +231,7 @@ Nsendfile(int fromfd, int tofd, const char *buf, size_t count)
if (r == 0)
r = sent;
#else
#if defined(__APPLE__) && defined(__MACH__) /* OS X */
#if defined(__APPLE__) && defined(__MACH__) && defined(MAC_OS_X_VERSION_10_6) /* OS X */
sent = nleft;
r = sendfile(fromfd, tofd, offset, &sent, NULL, 0);
if (r == 0)