diff options
| author | Henrik Nord <[email protected]> | 2015-11-16 13:25:03 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-11-16 13:25:03 +0100 |
| commit | 828867abc55c64f61dd4c0e67dc4e0ad5becf4dc (patch) | |
| tree | ef60e70964237923af6593eaddbecedeb060e250 /erts | |
| parent | b1c85b4310d7b33ddcc6c121a95db1c12a83a882 (diff) | |
| parent | c16c45a587a199987dae799ea02fb9c32216854f (diff) | |
| download | otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.tar.gz otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.tar.bz2 otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.h | 2 | ||||
| -rw-r--r-- | erts/etc/common/erlexec.c | 2 | ||||
| -rw-r--r-- | erts/preloaded/src/prim_inet.erl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/sys/common/erl_poll.h b/erts/emulator/sys/common/erl_poll.h index 6d8aef822e..bc2c681876 100644 --- a/erts/emulator/sys/common/erl_poll.h +++ b/erts/emulator/sys/common/erl_poll.h @@ -122,7 +122,7 @@ typedef Uint32 ErtsPollEvents; #endif #define ERTS_POLL_EV_E2N(EV) \ - ((__uint32_t) (EV)) + ((uint32_t) (EV)) #define ERTS_POLL_EV_N2E(EV) \ ((ErtsPollEvents) (EV)) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 461957be10..c9f5fd66a1 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -724,7 +724,7 @@ int main(int argc, char **argv) * on itself here. We'll avoid doing that. */ if (strcmp(argv[i], "-make") == 0) { - add_args("-noshell", "-noinput", "-s", "make", "all", NULL); + add_args("-noshell", "-noinput", "-s", "make", "all_or_nothing", NULL); add_Eargs("-B"); haltAfterwards = 1; i = argc; /* Skip rest of command line */ diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl index d5c8fd4268..bd74831bb7 100644 --- a/erts/preloaded/src/prim_inet.erl +++ b/erts/preloaded/src/prim_inet.erl @@ -232,7 +232,7 @@ bindx(S, AddFlag, Addrs) -> %% if timeout is given: %% timeout < 0 -> infinity %% 0 -> immediate connect (mostly works for loopback) -%% > 0 -> wait for timout ms if not connected then +%% > 0 -> wait for timeout ms if not connected then %% return {error, timeout} %% %% ASYNC_CONNECT(insock(), IP, Port, Timeout) -> {ok, S, Ref} | {error, Reason} @@ -273,7 +273,7 @@ async_connect(S, IP, Port, Time) -> %% if timeout is given: %% timeout < 0 -> infinity %% 0 -> immediate accept (poll) -%% > 0 -> wait for timout ms for accept if no accept then +%% > 0 -> wait for timeout ms for accept if no accept then %% return {error, timeout} %% %% ASYNC_ACCEPT(insock(), Timeout) |