[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] mingw: Fix builds on f33 mingw
From: |
Peter Maydell |
Subject: |
Re: [PATCH] mingw: Fix builds on f33 mingw |
Date: |
Mon, 12 Oct 2020 16:05:04 +0100 |
On Mon, 12 Oct 2020 at 15:39, Laurent Vivier <laurent@vivier.eu> wrote:
>
> Le 08/10/2020 à 19:46, Thomas Huth a écrit :
> > On 08/10/2020 19.43, Dr. David Alan Gilbert (git) wrote:
> >> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> >>
> >> Fedora 33's mingw moans about:
> >>
> >> In file included from ../tests/test-bitmap.c:12:
> >> /home/dgilbert/git/migpull/include/qemu/osdep.h:76: error:
> >> "__USE_MINGW_ANSI_STDIO" redefined [-Werror]
> >> 76 | #define __USE_MINGW_ANSI_STDIO 1
> >> |
> >>
> >> the fix is to make sure osdep.h is the first include - which is our
> >> rule anyway; but one we broke in a couple of places.
> >>
> >> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> >> ---
> >> migration/dirtyrate.c | 2 +-
> >> tests/test-bitmap.c | 2 +-
> >> 2 files changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
> >> index ab9e1301f6..42b71e771e 100644
> >> --- a/migration/dirtyrate.c
> >> +++ b/migration/dirtyrate.c
> >> @@ -10,8 +10,8 @@
> >> * See the COPYING file in the top-level directory.
> >> */
> >>
> >> -#include <zlib.h>
> >> #include "qemu/osdep.h"
> >> +#include <zlib.h>
> >> #include "qapi/error.h"
> >> #include "cpu.h"
> >> #include "qemu/config-file.h"
> >> diff --git a/tests/test-bitmap.c b/tests/test-bitmap.c
> >> index 2f5b71458a..c3c9d79667 100644
> >> --- a/tests/test-bitmap.c
> >> +++ b/tests/test-bitmap.c
> >> @@ -8,8 +8,8 @@
> >> * Author: Peter Xu <peterx@redhat.com>
> >> */
> >>
> >> -#include <stdlib.h>
> >> #include "qemu/osdep.h"
> >> +#include <stdlib.h>
> >> #include "qemu/bitmap.h"
> >>
> >> #define BMAP_SIZE 1024
> >>
> >
> > Reviewed-by: Thomas Huth <thuth@redhat.com>
> >
> >
>
> Applied to my trivial-patches branch.
This is the wrong version of this patch -- can you take
Marc-André's instead, please?
thanks
-- PMM