aboutsummaryrefslogtreecommitdiffstats
path: root/erts
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 /erts
parent3a7e0e88fa8b787df328e32fac7566f67fda9c54 (diff)
parente22e19a9dcf3e125f29ebd5ac24c3cc5c8856895 (diff)
downloadotp-48327e7133e92cd609b733a30fdd3125f506c52c.tar.gz
otp-48327e7133e92cd609b733a30fdd3125f506c52c.tar.bz2
otp-48327e7133e92cd609b733a30fdd3125f506c52c.zip
Merge branch 'maint'
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