aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-06-04 10:56:13 +0200
committerMarcus Arendt <[email protected]>2014-06-04 10:56:13 +0200
commite22e19a9dcf3e125f29ebd5ac24c3cc5c8856895 (patch)
treee58cebad1ead6d5a47deb4bb6426caecf0a8f49b /lib/erl_interface
parent6fd795f56297141507e06254a495a06f40c88521 (diff)
parent64cb86b407cf7d0c0f7ac834dd93be6708ed89b1 (diff)
downloadotp-e22e19a9dcf3e125f29ebd5ac24c3cc5c8856895.tar.gz
otp-e22e19a9dcf3e125f29ebd5ac24c3cc5c8856895.tar.bz2
otp-e22e19a9dcf3e125f29ebd5ac24c3cc5c8856895.zip
Merge branch 'fenek/fix/vstudio_macro' into maint
* fenek/fix/vstudio_macro: Add Visual Studio macros to erl_driver.h and ei.h
Diffstat (limited to 'lib/erl_interface')
-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