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/emulator/beam/erl_printf_term.h | |
| 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/emulator/beam/erl_printf_term.h')
| -rw-r--r-- | erts/emulator/beam/erl_printf_term.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_printf_term.h b/erts/emulator/beam/erl_printf_term.h index a48a3de34c..d9bf79a5ce 100644 --- a/erts/emulator/beam/erl_printf_term.h +++ b/erts/emulator/beam/erl_printf_term.h @@ -21,6 +21,6 @@ #define ERL_PRINTF_TERM_H__ #include "erl_printf_format.h" -int erts_printf_term(fmtfn_t fn, void* arg, unsigned long term, long precision, - unsigned long* term_base); +int erts_printf_term(fmtfn_t fn, void* arg, ErlPfEterm term, long precision, + ErlPfEterm* term_base); #endif |