diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-07-16 12:13:52 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-07-16 12:13:52 +0000 |
| commit | 526ccb7a26fea4b07eae4d34c8ad0599802a93ce (patch) | |
| tree | 34ff707ff9bc0d57dd583c1b19f683defcfea80a /linux-user/flatload.c | |
| parent | c5f2f66835c8b42fc58c7af9a4454be708304cfa (diff) | |
Fix a bunch of type mismatch-related warnings (Jan Kiszka).
Fix a typo in my previous comming (spotted by Laurent Desnouges).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4877 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user/flatload.c')
| -rw-r--r-- | linux-user/flatload.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 95d386468a..29664b1447 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -349,9 +349,9 @@ void old_reloc(struct lib_info *libinfo, uint32_t rl) reloc_type = rl >> 30; /* ??? How to handle this? */ #if defined(CONFIG_COLDFIRE) - ptr = (uint32_t *) (libinfo->start_code + offset); + ptr = (uint32_t *) ((unsigned long) libinfo->start_code + offset); #else - ptr = (uint32_t *) (libinfo->start_data + offset); + ptr = (uint32_t *) ((unsigned long) libinfo->start_data + offset); #endif #ifdef DEBUG @@ -670,7 +670,7 @@ static int load_flat_file(struct linux_binprm * bprm, } /* zero the BSS. */ - memset((void*)(datapos + data_len), 0, bss_len); + memset((void *)((unsigned long)datapos + data_len), 0, bss_len); return 0; } |