diff options
| author | Sverker Eriksson <[email protected]> | 2016-08-30 17:08:08 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-08-30 17:08:08 +0200 |
| commit | 9a610d82a4c3746b3e2d23429f42272c7a57be78 (patch) | |
| tree | 709134faf2911e4d3c0f2f7d3ad14d30ff8bca15 /lib | |
| parent | b532d464577ab7efbd3d7075ca90175c973d315e (diff) | |
| parent | e23ca15e90b45b278bff5cf2597dc9cb0b6fe43f (diff) | |
| download | otp-9a610d82a4c3746b3e2d23429f42272c7a57be78.tar.gz otp-9a610d82a4c3746b3e2d23429f42272c7a57be78.tar.bz2 otp-9a610d82a4c3746b3e2d23429f42272c7a57be78.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erl_interface/src/misc/ei_portio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erl_interface/src/misc/ei_portio.h b/lib/erl_interface/src/misc/ei_portio.h index fbb61b0ccf..bded811a35 100644 --- a/lib/erl_interface/src/misc/ei_portio.h +++ b/lib/erl_interface/src/misc/ei_portio.h @@ -21,7 +21,7 @@ */ #ifndef _EI_PORTIO_H #define _EI_PORTIO_H -#if !defined(__WIN32__) || !defined(VXWORKS) +#if !defined(__WIN32__) && !defined(VXWORKS) #ifdef HAVE_WRITEV /* Declaration of struct iovec *iov should be visible in this scope. */ #include <sys/uio.h> |