diff options
| author | Lukas Larsson <[email protected]> | 2018-11-28 11:06:19 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-12-03 14:41:13 +0100 |
| commit | 4e5e0c6103982775e8e890f7d7c209cba279d0d6 (patch) | |
| tree | f5eb932b6d50f7532bd2cc3e99a10df580e745de | |
| parent | cc21219185d7ff90b5d3d09cae896082d7627ea9 (diff) | |
| download | otp-4e5e0c6103982775e8e890f7d7c209cba279d0d6.tar.gz otp-4e5e0c6103982775e8e890f7d7c209cba279d0d6.tar.bz2 otp-4e5e0c6103982775e8e890f7d7c209cba279d0d6.zip | |
erts: Fix some 32-bit gcc warnings
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 4 | ||||
| -rw-r--r-- | erts/emulator/nifs/common/prim_file_nif.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index a5740a08cf..0be4562785 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -834,6 +834,8 @@ static ERTS_INLINE void clr_bit(UWord* map, Uint ix) &= ~((UWord)1 << (ix % ERTS_VSPACE_WORD_BITS)); } +#ifdef DEBUG + static ERTS_INLINE int is_bit_set(UWord* map, Uint ix) { ASSERT(ix / ERTS_VSPACE_WORD_BITS < VSPACE_MAP_SZ); @@ -841,6 +843,8 @@ static ERTS_INLINE int is_bit_set(UWord* map, Uint ix) & ((UWord)1 << (ix % ERTS_VSPACE_WORD_BITS)); } +#endif + UWord erts_literal_vspace_map[VSPACE_MAP_SZ]; static void set_literal_range(void* start, Uint size) diff --git a/erts/emulator/nifs/common/prim_file_nif.c b/erts/emulator/nifs/common/prim_file_nif.c index ba36a33458..b34bf11205 100644 --- a/erts/emulator/nifs/common/prim_file_nif.c +++ b/erts/emulator/nifs/common/prim_file_nif.c @@ -933,7 +933,7 @@ static ERL_NIF_TERM set_permissions_nif(ErlNifEnv *env, int argc, const ERL_NIF_ posix_errno_t posix_errno; efile_path_t path; - Uint32 permissions; + Uint permissions; if(argc != 2 || !enif_get_uint(env, argv[1], &permissions)) { return enif_make_badarg(env); @@ -952,7 +952,7 @@ static ERL_NIF_TERM set_owner_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM a posix_errno_t posix_errno; efile_path_t path; - Sint32 uid, gid; + Sint uid, gid; if(argc != 3 || !enif_get_int(env, argv[1], &uid) || !enif_get_int(env, argv[2], &gid)) { |