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/emulator | |
| 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/emulator')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.h | 2 |
1 files changed, 1 insertions, 1 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)) |