diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-06-08 11:44:23 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-06-08 11:44:23 +0200 |
| commit | 55e96edb7bbb849fafaf628119fc2db9dea22e1e (patch) | |
| tree | 44a3fe66c6122ebad62e5e8bff58d00dd3cb4698 /lib | |
| parent | a39395d4f99aff99ac57ab40a3191fa13a7371fd (diff) | |
| parent | e2bb65e6354123ac5d0ec9e2c1de6a92ae581161 (diff) | |
| download | otp-55e96edb7bbb849fafaf628119fc2db9dea22e1e.tar.gz otp-55e96edb7bbb849fafaf628119fc2db9dea22e1e.tar.bz2 otp-55e96edb7bbb849fafaf628119fc2db9dea22e1e.zip | |
Merge branch 'egil/erts/fix-clang-compiler-warnings'
* egil/erts/fix-clang-compiler-warnings:
erl_interface: Let struct iovec * be visible
erts: Let clang have suppressable unused variables
erts: Remove tautological compare warning
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erl_interface/src/misc/ei_portio.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/erl_interface/src/misc/ei_portio.h b/lib/erl_interface/src/misc/ei_portio.h index a14fdbd7d1..fbb61b0ccf 100644 --- a/lib/erl_interface/src/misc/ei_portio.h +++ b/lib/erl_interface/src/misc/ei_portio.h @@ -21,6 +21,12 @@ */ #ifndef _EI_PORTIO_H #define _EI_PORTIO_H +#if !defined(__WIN32__) || !defined(VXWORKS) +#ifdef HAVE_WRITEV +/* Declaration of struct iovec *iov should be visible in this scope. */ +#include <sys/uio.h> +#endif +#endif int ei_accept_t(int fd, void *addr, void *addrlen, unsigned ms); int ei_connect_t(int fd, void *sinp, int sin_siz, unsigned ms); @@ -29,8 +35,7 @@ int ei_write_fill(int fd, const char *buf, int len); int ei_read_fill_t(int fd, char* buf, int len, unsigned ms); int ei_write_fill_t(int fd, const char *buf, int len, unsigned ms); #ifdef HAVE_WRITEV -int ei_writev_fill_t(int fd, const struct iovec *iov, int iovcnt, - unsigned ms); +int ei_writev_fill_t(int fd, const struct iovec *iov, int iovcnt, unsigned ms); #endif #endif /* _EI_PORTIO_H */ |