diff options
| author | Sverker Eriksson <[email protected]> | 2013-02-22 15:46:52 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-02-22 15:47:02 +0100 |
| commit | 2ff92dc7c2aa5c052df47776b782500815ce72eb (patch) | |
| tree | aacbf3acec409887c39493b59eff785649c4b0ec /erts/lib_src/common/erl_misc_utils.c | |
| parent | 17231ca24cbf3b136301f1076bb94247344e9f35 (diff) | |
| parent | 944fca78d202712848e317ec666647e8db78bcb4 (diff) | |
| download | otp-2ff92dc7c2aa5c052df47776b782500815ce72eb.tar.gz otp-2ff92dc7c2aa5c052df47776b782500815ce72eb.tar.bz2 otp-2ff92dc7c2aa5c052df47776b782500815ce72eb.zip | |
Merge branch 'sverk/win-64-pointer-fix'
* sverk/win-64-pointer-fix:
erts: Correct term type for printf %T
erts: Correct internal printf integer type for win64
erts: Correct some printf type formatting
erts: Fix type bug in get_proc_affinity for windows
OTP-10887
Forgot this ticket for sverk/erlang_pid-revert:
OTP-10885
Diffstat (limited to 'erts/lib_src/common/erl_misc_utils.c')
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index 11e2c56f61..9e9c142449 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -192,7 +192,8 @@ struct erts_cpu_info_t_ { static __forceinline int get_proc_affinity(erts_cpu_info_t *cpuinfo, cpu_set_t *cpuset) { - DWORD pamask, samask; + DWORD_PTR pamask; + DWORD_PTR samask; if (GetProcessAffinityMask(GetCurrentProcess(), &pamask, &samask)) { *cpuset = (cpu_set_t) pamask; return 0; |