diff options
| author | Jef Poskanzer <jef@mail.acme.com> | 2013-06-07 08:16:24 -0700 |
|---|---|---|
| committer | Jef Poskanzer <jef@mail.acme.com> | 2013-06-07 08:16:24 -0700 |
| commit | c39c4f503fff70506d1d026e1b8aad8f5c978ff0 (patch) | |
| tree | be456578918fd11114ceee5b3351b34b0b19727b /src/net.c | |
| parent | 5ec1d758f1e8d1cd95689b8aa085dd7d478c96fa (diff) | |
| download | iperf3-c39c4f503fff70506d1d026e1b8aad8f5c978ff0.tar.gz | |
Added an ifdef for Mac OS/X version, to better protect the sendfile code.
Diffstat (limited to 'src/net.c')
| -rw-r--r-- | src/net.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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) |