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/include | |
| 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/include')
| -rw-r--r-- | erts/include/internal/erl_printf_format.h | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/erts/include/internal/erl_printf_format.h b/erts/include/internal/erl_printf_format.h index 064c4a5c09..0f35c41044 100644 --- a/erts/include/internal/erl_printf_format.h +++ b/erts/include/internal/erl_printf_format.h @@ -28,6 +28,22 @@ #include <stdarg.h> #include <stdlib.h> +#include "erl_int_sizes_config.h" + +#if SIZEOF_VOID_P == SIZEOF_LONG +typedef unsigned long ErlPfUWord; +typedef long ErlPfSWord; +#elif SIZEOF_VOID_P == SIZEOF_INT +typedef unsigned int ErlPfUWord; +typedef int ErlPfSWord; +#elif SIZEOF_VOID_P == SIZEOF_LONG_LONG +typedef unsigned long long ErlPfUWord; +typedef long long ErlPfSWord; +#else +#error Found no appropriate type to use for 'Eterm', 'Uint' and 'Sint' +#endif + + typedef int (*fmtfn_t)(void*, char*, size_t); extern int erts_printf_format(fmtfn_t, void*, char*, va_list); @@ -36,11 +52,21 @@ extern int erts_printf_char(fmtfn_t, void*, char); extern int erts_printf_string(fmtfn_t, void*, char *); extern int erts_printf_buf(fmtfn_t, void*, char *, size_t); extern int erts_printf_pointer(fmtfn_t, void*, void *); -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_uword(fmtfn_t, void*, char, int, int, ErlPfUWord); +extern int erts_printf_sword(fmtfn_t, void*, char, int, int, ErlPfSWord); extern int erts_printf_double(fmtfn_t, void *, char, int, int, double); -extern int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long, unsigned long*); - +#ifdef HALFWORD_HEAP_EMULATOR +# if SIZEOF_INT != 4 +# error Unsupported integer size for HALFWORD_HEAP_EMULATOR +# endif +typedef unsigned int ErlPfEterm; +#else +typedef ErlPfUWord ErlPfEterm; #endif +extern int (*erts_printf_eterm_func)(fmtfn_t, void*, ErlPfEterm, long, ErlPfEterm*); + + +#endif /* ERL_PRINTF_FORMAT_H__ */ + |