diff options
| author | Marcus Arendt <[email protected]> | 2014-06-04 10:59:01 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-06-04 10:59:01 +0200 |
| commit | 48327e7133e92cd609b733a30fdd3125f506c52c (patch) | |
| tree | 3474f6ce02d638d4b4d35e61bcdce6edc2f5f400 | |
| parent | 3a7e0e88fa8b787df328e32fac7566f67fda9c54 (diff) | |
| parent | e22e19a9dcf3e125f29ebd5ac24c3cc5c8856895 (diff) | |
| download | otp-48327e7133e92cd609b733a30fdd3125f506c52c.tar.gz otp-48327e7133e92cd609b733a30fdd3125f506c52c.tar.bz2 otp-48327e7133e92cd609b733a30fdd3125f506c52c.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/emulator/beam/erl_driver.h | 2 | ||||
| -rw-r--r-- | lib/erl_interface/include/ei.h | 2 |
2 files changed, 2 insertions, 2 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 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 |