diff options
| author | Patrik Nyblom <[email protected]> | 2013-01-25 21:44:48 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-01-25 21:44:48 +0100 |
| commit | debbee7ddf7b356f10f1dc12c874ed6e80c02c20 (patch) | |
| tree | 42464367c52bb177cb037faa2faec70673a0fe34 /erts/emulator/beam/external.c | |
| parent | 725618258bdd33e25e5a156f6774832054a6af9a (diff) | |
| parent | 90b44f551fd3d988b34a9fb7d32598b789a0c546 (diff) | |
| download | otp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.tar.gz otp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.tar.bz2 otp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.zip | |
Merge branch 'pan/fix-compiler-warnings-clang-and-new-gcc'
* pan/fix-compiler-warnings-clang-and-new-gcc:
Fix compiler warnings from GCC 4.7.1 on ARCH Linux
Fix clang compiler warnings on FreeBSD in erts
Diffstat (limited to 'erts/emulator/beam/external.c')
| -rw-r--r-- | erts/emulator/beam/external.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index 83fdb958f8..546e5d6ce0 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -948,7 +948,7 @@ BIF_RETTYPE erts_debug_dist_ext_to_term_2(BIF_ALIST_2) Eterm res; Eterm *hp; Eterm *hendp; - Uint hsz; + Sint hsz; ErtsDistExternal ede; Eterm *tp; Eterm real_bin; @@ -994,7 +994,7 @@ BIF_RETTYPE erts_debug_dist_ext_to_term_2(BIF_ALIST_2) if (hsz < 0) goto badarg; - hp = HAlloc(BIF_P, hsz); + hp = HAlloc(BIF_P, (Uint) hsz); hendp = hp + hsz; res = erts_decode_dist_ext(&hp, &MSO(BIF_P), &ede); |