diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-11-27 16:39:27 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-11-27 16:39:27 +0100 |
| commit | 72f4349d634a8bbf8de5a50ac4535eb8ee157b6c (patch) | |
| tree | 5702d60694fffcb93d3de7414153baaf404c1786 /erts/emulator | |
| parent | 24ad798b11b93360649f93c85fcff87b18db4c6b (diff) | |
| parent | 2aeaadaf0b908cbec7f0501458eca65ebaa7b33b (diff) | |
| download | otp-72f4349d634a8bbf8de5a50ac4535eb8ee157b6c.tar.gz otp-72f4349d634a8bbf8de5a50ac4535eb8ee157b6c.tar.bz2 otp-72f4349d634a8bbf8de5a50ac4535eb8ee157b6c.zip | |
Merge branch 'egil/darwin-fixes'
* egil/darwin-fixes:
erl_interface: Avoid redefinition of ALIGNBYTES
erts: Fix '#ifdef' for unused static functions
erts: Remove forgotten vxworks includes
hipe: Cast offsetof to int in hipe_arch_print_pcb
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/hipe/hipe_x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/hipe/hipe_x86.c b/erts/emulator/hipe/hipe_x86.c index 24d232c968..4281730ae2 100644 --- a/erts/emulator/hipe/hipe_x86.c +++ b/erts/emulator/hipe/hipe_x86.c @@ -265,7 +265,7 @@ void *hipe_make_native_stub(void *beamAddress, unsigned int beamArity) void hipe_arch_print_pcb(struct hipe_process_state *p) { #define U(n,x) \ - printf(" % 4d | %s | 0x%08x | |\r\n", offsetof(struct hipe_process_state,x), n, (unsigned)p->x) + printf(" % 4d | %s | 0x%08x | |\r\n", (int)offsetof(struct hipe_process_state,x), n, (unsigned)p->x) U("ncsp ", ncsp); U("narity ", narity); #undef U |