diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-25 13:27:43 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-11-25 13:27:43 -0800 |
| commit | 111e3d3d9cb6d59f0b2097c6641a7694a86edae5 (patch) | |
| tree | fc336149e883a0d8d73a0197d6810e0163d65668 | |
| parent | 9c7e5c7c33607fce4c91e22dcf38237256450b9a (diff) | |
| download | system_core-111e3d3d9cb6d59f0b2097c6641a7694a86edae5.zip system_core-111e3d3d9cb6d59f0b2097c6641a7694a86edae5.tar.gz system_core-111e3d3d9cb6d59f0b2097c6641a7694a86edae5.tar.bz2 | |
Only Windows doesn't have <sys/uio.h>.
This should probably be in libcutils instead, so code that needs to
care about Windows can use readv/writev.
Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
| -rw-r--r-- | include/log/uio.h | 13 | ||||
| -rw-r--r-- | liblog/uio.c | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/include/log/uio.h b/include/log/uio.h index a71f515..7059da5 100644 --- a/include/log/uio.h +++ b/include/log/uio.h @@ -14,20 +14,23 @@ * limitations under the License. */ -// -// implementation of sys/uio.h for platforms that don't have it (Win32) -// #ifndef _LIBS_CUTILS_UIO_H #define _LIBS_CUTILS_UIO_H -#ifdef HAVE_SYS_UIO_H +#if !defined(_WIN32) + #include <sys/uio.h> + #else #ifdef __cplusplus extern "C" { #endif +// +// Implementation of sys/uio.h for Win32. +// + #include <stddef.h> struct iovec { @@ -42,7 +45,7 @@ extern int writev( int fd, const struct iovec* vecs, int count ); } #endif -#endif /* !HAVE_SYS_UIO_H */ +#endif #endif /* _LIBS_UTILS_UIO_H */ diff --git a/liblog/uio.c b/liblog/uio.c index 24a6507..f77cc49 100644 --- a/liblog/uio.c +++ b/liblog/uio.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#ifndef HAVE_SYS_UIO_H +#if defined(_WIN32) #include <log/uio.h> #include <unistd.h> @@ -73,4 +73,4 @@ Exit: return total; } -#endif /* !HAVE_SYS_UIO_H */ +#endif |