From 9dfa5b421dcb7f213163d2bd80549d6ca4bc74a6 Mon Sep 17 00:00:00 2001 From: bellard Date: Mon, 11 Aug 2003 20:35:58 +0000 Subject: [PATCH] 64 bit fixes (Falk Hueffner) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@365 c046a42c-6fe2-441c-8c8c-71466251a162 --- linux-user/signal.c | 2 +- vl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 46abf53..0d2e301 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -152,7 +152,7 @@ void target_to_host_sigset(sigset_t *d, const target_sigset_t *s) ((unsigned long *)d)[i] = tswapl(s->sig[i]); } #elif TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 64 && TARGET_NSIG_WORDS == 2 - ((unsigned long *)d)[0] = sigmask | (tswapl(s->sig[1]) << 32); + ((unsigned long *)d)[0] = sigmask | ((unsigned long)tswapl(s->sig[1]) << 32); #else #error target_to_host_sigset #endif /* TARGET_LONG_BITS */ diff --git a/vl.h b/vl.h index 669bd22..531eabe 100644 --- a/vl.h +++ b/vl.h @@ -60,7 +60,7 @@ int bdrv_commit(BlockDriverState *bs); struct cow_header_v2 { uint32_t magic; - uint32_t long version; + uint32_t version; char backing_file[1024]; int32_t mtime; uint64_t size; -- 1.7.9.5