aboutsummaryrefslogtreecommitdiffstats
path: root/erts
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 /erts
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 'erts')
-rw-r--r--erts/emulator/beam/erl_driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index 3ecb379326..5ced8c5ca0 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -198,7 +198,7 @@ typedef long long ErlDrvSInt64;
#error No 64-bit integer type
#endif
-#if defined(__WIN32__)
+#if defined(__WIN32__) || defined(_WIN32)
typedef ErlDrvUInt ErlDrvSizeT;
typedef ErlDrvSInt ErlDrvSSizeT;
#else