diff options
| author | Henrik Nord <[email protected]> | 2015-11-16 13:24:12 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-11-16 13:24:12 +0100 |
| commit | fcf3804e78e921ecdf4f422cb97eca94fdf34fb4 (patch) | |
| tree | 59e6140cebc38a97f9c2f1302407b2d27d0c87c8 /erts | |
| parent | 76a1087d42aace47bd54cddd1655bf7715feb4ef (diff) | |
| parent | 1cb0967db5ab24bcf4b492b273401e63c1fdae1a (diff) | |
| download | otp-fcf3804e78e921ecdf4f422cb97eca94fdf34fb4.tar.gz otp-fcf3804e78e921ecdf4f422cb97eca94fdf34fb4.tar.bz2 otp-fcf3804e78e921ecdf4f422cb97eca94fdf34fb4.zip | |
Merge branch 'zenhack/fix-erroneous-__uint32_t' into maint
* zenhack/fix-erroneous-__uint32_t:
Fix erroneous use of __uint32_t
OTP-13105
Diffstat (limited to 'erts')
| -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 19ce582154..bd3a46ef0f 100644 --- a/erts/emulator/sys/common/erl_poll.h +++ b/erts/emulator/sys/common/erl_poll.h @@ -140,7 +140,7 @@ struct erts_sys_fd_type { #endif #define ERTS_POLL_EV_E2N(EV) \ - ((__uint32_t) (EV)) + ((uint32_t) (EV)) #define ERTS_POLL_EV_N2E(EV) \ ((ErtsPollEvents) (EV)) |