diff options
| author | Sverker Eriksson <[email protected]> | 2016-02-18 15:59:56 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-02-18 15:59:56 +0100 |
| commit | eae8965a58b049cef1562b4462b05d9cab5286c3 (patch) | |
| tree | 2efb7416fadd4820d7d8f1a83cf16d3d73d5744f /erts/emulator/beam/global.h | |
| parent | 85d2337de76ba43f087478d4566641d632f06fec (diff) | |
| parent | 7a319cd96f7f4869300b32442ebe892ae557f41c (diff) | |
| download | otp-eae8965a58b049cef1562b4462b05d9cab5286c3.tar.gz otp-eae8965a58b049cef1562b4462b05d9cab5286c3.tar.bz2 otp-eae8965a58b049cef1562b4462b05d9cab5286c3.zip | |
Merge branch 'sverk/fix-list-length-int/OTP-13288'
* sverk/fix-list-length-int/OTP-13288:
erts: Fix error cases in enif_get_list_length
erts: Use Sint instead of int for list lengths
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 4247b25ab1..2a8bdb6ee3 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1311,7 +1311,7 @@ int erts_utf8_to_latin1(byte* dest, const byte* source, int slen); #define ERTS_UTF8_OK_MAX_CHARS 4 void bin_write(int, void*, byte*, size_t); -int intlist_to_buf(Eterm, char*, int); /* most callers pass plain char*'s */ +Sint intlist_to_buf(Eterm, char*, Sint); /* most callers pass plain char*'s */ struct Sint_buf { #if defined(ARCH_64) @@ -1384,7 +1384,7 @@ ErlDrvSizeT erts_iolist_to_buf(Eterm, char*, ErlDrvSizeT); ErlDrvSizeT erts_iolist_to_buf_yielding(ErtsIOList2BufState *); int erts_iolist_size_yielding(ErtsIOListState *state); int erts_iolist_size(Eterm, ErlDrvSizeT *); -int is_string(Eterm); +Sint is_string(Eterm); void erl_at_exit(void (*) (void*), void*); Eterm collect_memory(Process *); void dump_memory_to_fd(int); |