diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-05-12 14:48:28 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-05-12 14:48:28 +0200 |
| commit | b1e768e86593178810c8a0b3c38443dcf6be5181 (patch) | |
| tree | 3256f7af5078db1221738b24060ab8d7a237bb6f /erts/include | |
| parent | a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412 (diff) | |
| parent | 9b1910d81ae53a4141ab84be6e1b4dd92bf3dde0 (diff) | |
| download | otp-b1e768e86593178810c8a0b3c38443dcf6be5181.tar.gz otp-b1e768e86593178810c8a0b3c38443dcf6be5181.tar.bz2 otp-b1e768e86593178810c8a0b3c38443dcf6be5181.zip | |
Merge branch 'sverker/halfword-printf-relative-terms/OTP-9292' into dev
* sverker/halfword-printf-relative-terms/OTP-9292:
ETS usage of erts_printf %R
erts_printf %R for relative ets-terms in halfword-vm
Another halfword is_same-bug for ETS ordered_set
Diffstat (limited to 'erts/include')
| -rw-r--r-- | erts/include/internal/erl_printf_format.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/include/internal/erl_printf_format.h b/erts/include/internal/erl_printf_format.h index 45818079ea..400cc7dafd 100644 --- a/erts/include/internal/erl_printf_format.h +++ b/erts/include/internal/erl_printf_format.h @@ -40,7 +40,7 @@ extern int erts_printf_ulong(fmtfn_t, void*, char, int, int, unsigned long); extern int erts_printf_slong(fmtfn_t, void*, char, int, int, signed long); extern int erts_printf_double(fmtfn_t, void *, char, int, int, double); -extern int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long); +extern int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long, unsigned long*); #endif |