diff options
| author | Marcus Arendt <[email protected]> | 2014-08-28 10:26:04 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-08-28 10:26:04 +0200 |
| commit | deb3008fb728f2089e844a53c95a8d7bfb4dfb5c (patch) | |
| tree | 5cf9b6b6bdf87546fd38f90da8a5d51440dfbcb2 /erts | |
| parent | 2fbce26b3fe4bd7b4401f0e1313b778c38be36b2 (diff) | |
| parent | f5b36fc72e1ac37d00f82b7651b7ca06a628097f (diff) | |
| download | otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.tar.gz otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.tar.bz2 otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 2 | ||||
| -rw-r--r-- | erts/emulator/drivers/unix/multi_drv.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 09d90f4984..891589d1c5 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -5778,7 +5778,7 @@ done: ia_p->Ipv6IfIndex && ia_p->Ipv6IfIndex != index) { - /* Oops, there was an other interface for IPv6. Possible? XXX */ + /* Oops, there was another interface for IPv6. Possible? XXX */ index = ia_p->Ipv6IfIndex; goto index; } diff --git a/erts/emulator/drivers/unix/multi_drv.c b/erts/emulator/drivers/unix/multi_drv.c index 822c96730c..724d325ed5 100644 --- a/erts/emulator/drivers/unix/multi_drv.c +++ b/erts/emulator/drivers/unix/multi_drv.c @@ -20,7 +20,7 @@ /* Purpose: Multidriver interface This is an example of a driver which allows multiple instances of itself. I.e have one erlang process execute open_port(multi......) and - at the same time have an other erlang process open an other port + at the same time have another erlang process open another port running multi there as well. */ diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c index 0a58a625b2..aa412a20c8 100644 --- a/erts/emulator/sys/common/erl_poll.c +++ b/erts/emulator/sys/common/erl_poll.c @@ -2157,7 +2157,7 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps, #ifdef ERTS_POLL_DEBUG_PRINT erts_printf("Entering erts_poll_wait(), timeout=%d\n", - (int) tv->tv_sec*1000 + tv->tv_usec/1000); + (int) tvp->tv_sec*1000 + tvp->tv_usec/1000); #endif if (ERTS_POLLSET_SET_POLLED_CHK(ps)) { |