aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-08-30 17:07:24 +0200
committerSverker Eriksson <[email protected]>2016-08-30 17:07:24 +0200
commite23ca15e90b45b278bff5cf2597dc9cb0b6fe43f (patch)
tree782e0a769b08f2b414a05b9b78ac1e632188fecd /lib/erl_interface/src
parent9f794b187208729728a3e5c11ed2e8f959174a5c (diff)
parenteb97d076f5364ccabbdf3ceacdea381e3f9a3444 (diff)
downloadotp-e23ca15e90b45b278bff5cf2597dc9cb0b6fe43f.tar.gz
otp-e23ca15e90b45b278bff5cf2597dc9cb0b6fe43f.tar.bz2
otp-e23ca15e90b45b278bff5cf2597dc9cb0b6fe43f.zip
Merge branch 'sverker/erl_interface/vxworks-socklen_t' into maint
Diffstat (limited to 'lib/erl_interface/src')
-rw-r--r--lib/erl_interface/src/misc/ei_portio.h2
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>