diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-25 21:55:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 21:55:37 +0000 |
| commit | bbd3b7edd7d2871e2327250219bb70e7c653e63d (patch) | |
| tree | 259eccdfe18e9499320339c5879152415cdd2f37 /include | |
| parent | f11758bb58af4241817b0b374f913b39d1f32e44 (diff) | |
| parent | c0ac9313e942fb7d3a027cec41904c18d8841521 (diff) | |
| download | system_core-bbd3b7edd7d2871e2327250219bb70e7c653e63d.zip system_core-bbd3b7edd7d2871e2327250219bb70e7c653e63d.tar.gz system_core-bbd3b7edd7d2871e2327250219bb70e7c653e63d.tar.bz2 | |
am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."
* commit 'c0ac9313e942fb7d3a027cec41904c18d8841521':
Only Windows doesn't have <sys/uio.h>.
Diffstat (limited to 'include')
| -rw-r--r-- | include/log/uio.h | 13 |
1 files changed, 8 insertions, 5 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 */ |