| Message ID | 1289851248-20687-1-git-send-email-weil@mail.berlios.de |
|---|---|
| State | Accepted |
| Headers | show |
Thanks, applied. On Mon, Nov 15, 2010 at 8:00 PM, Stefan Weil <weil@mail.berlios.de> wrote: > The redundant forward declaration of qerror in machload.c > is removed because it should be taken from qemu.h. > > Please note that this patch is untested because > I have no matching environment to compile it. > > Cc: Blue Swirl <blauwirbel@gmail.com> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> > --- > darwin-user/machload.c | 2 +- > darwin-user/qemu.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/darwin-user/machload.c b/darwin-user/machload.c > index 4bb5c72..3bc3b65 100644 > --- a/darwin-user/machload.c > +++ b/darwin-user/machload.c > @@ -82,7 +82,7 @@ void *macho_text_sect = 0; > int macho_offset = 0; > > int load_object(const char *filename, struct target_pt_regs * regs, void ** mh); > -void qerror(const char *format, ...); > + > #ifdef TARGET_I386 > typedef struct mach_i386_thread_state { > unsigned int eax; > diff --git a/darwin-user/qemu.h b/darwin-user/qemu.h > index 0c5081b..b6d3e6c 100644 > --- a/darwin-user/qemu.h > +++ b/darwin-user/qemu.h > @@ -100,7 +100,7 @@ int do_sigaction(int sig, const struct sigaction *act, > int do_sigaltstack(const struct sigaltstack *ss, struct sigaltstack *oss); > > void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); > -void qerror(const char *fmt, ...); > +void qerror(const char *fmt, ...) GCC_FMT_ATTR(1, 2); > > void write_dt(void *ptr, unsigned long addr, unsigned long limit, int flags); > > -- > 1.7.2.3 > >
diff --git a/darwin-user/machload.c b/darwin-user/machload.c index 4bb5c72..3bc3b65 100644 --- a/darwin-user/machload.c +++ b/darwin-user/machload.c @@ -82,7 +82,7 @@ void *macho_text_sect = 0; int macho_offset = 0; int load_object(const char *filename, struct target_pt_regs * regs, void ** mh); -void qerror(const char *format, ...); + #ifdef TARGET_I386 typedef struct mach_i386_thread_state { unsigned int eax; diff --git a/darwin-user/qemu.h b/darwin-user/qemu.h index 0c5081b..b6d3e6c 100644 --- a/darwin-user/qemu.h +++ b/darwin-user/qemu.h @@ -100,7 +100,7 @@ int do_sigaction(int sig, const struct sigaction *act, int do_sigaltstack(const struct sigaltstack *ss, struct sigaltstack *oss); void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); -void qerror(const char *fmt, ...); +void qerror(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void write_dt(void *ptr, unsigned long addr, unsigned long limit, int flags);
The redundant forward declaration of qerror in machload.c is removed because it should be taken from qemu.h. Please note that this patch is untested because I have no matching environment to compile it. Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- darwin-user/machload.c | 2 +- darwin-user/qemu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)