diff options
| author | R. Blaine Whittle <[email protected]> | 2013-02-20 14:46:20 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-02-21 18:44:05 +0100 |
| commit | d78e430de1f22ed122d58ad49984ff88a8171b8f (patch) | |
| tree | 691c14b255c6436b3667f6f908fbbf1156f7e151 /erts/include | |
| parent | e41674160b3059a1bc507b4718c173c9879e506a (diff) | |
| download | otp-d78e430de1f22ed122d58ad49984ff88a8171b8f.tar.gz otp-d78e430de1f22ed122d58ad49984ff88a8171b8f.tar.bz2 otp-d78e430de1f22ed122d58ad49984ff88a8171b8f.zip | |
erts: Correct internal printf integer type for win64
Diffstat (limited to 'erts/include')
| -rw-r--r-- | erts/include/internal/erl_printf_format.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/erts/include/internal/erl_printf_format.h b/erts/include/internal/erl_printf_format.h index 064c4a5c09..6fe4af8fbb 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,12 @@ 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*); -#endif + +#endif /* ERL_PRINTF_FORMAT_H__ */ |