aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-06-04 10:59:01 +0200
committerMarcus Arendt <[email protected]>2014-06-04 10:59:01 +0200
commit48327e7133e92cd609b733a30fdd3125f506c52c (patch)
tree3474f6ce02d638d4b4d35e61bcdce6edc2f5f400 /lib
parent3a7e0e88fa8b787df328e32fac7566f67fda9c54 (diff)
parente22e19a9dcf3e125f29ebd5ac24c3cc5c8856895 (diff)
downloadotp-48327e7133e92cd609b733a30fdd3125f506c52c.tar.gz
otp-48327e7133e92cd609b733a30fdd3125f506c52c.tar.bz2
otp-48327e7133e92cd609b733a30fdd3125f506c52c.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/erl_interface/include/ei.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h
index a3eb437f88..3f3435977d 100644
--- a/lib/erl_interface/include/ei.h
+++ b/lib/erl_interface/include/ei.h
@@ -39,7 +39,7 @@
#include <stdio.h> /* Need type FILE */
#include <errno.h> /* Need EHOSTUNREACH, ENOMEM, ... */
-#if !defined(__WIN32__) && !defined(VXWORKS) || (defined(VXWORKS) && defined(HAVE_SENS))
+#if !(defined(__WIN32__) || defined(_WIN32)) && !defined(VXWORKS) || (defined(VXWORKS) && defined(HAVE_SENS))
# include <netdb.h>
#endif