* [PATCH] mingw: Fix builds on f33 mingw
@ 2020-10-08 17:43 Dr. David Alan Gilbert (git)
2020-10-08 17:46 ` Thomas Huth
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2020-10-08 17:43 UTC (permalink / raw)
To: qemu-devel, quintela, thuth
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
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] mingw: Fix builds on f33 mingw
2020-10-08 17:43 [PATCH] mingw: Fix builds on f33 mingw Dr. David Alan Gilbert (git)
@ 2020-10-08 17:46 ` Thomas Huth
2020-10-12 14:35 ` Laurent Vivier
2020-10-08 17:49 ` Philippe Mathieu-Daudé
2020-10-08 17:50 ` Richard Henderson
2 siblings, 1 reply; 7+ messages in thread
From: Thomas Huth @ 2020-10-08 17:46 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git), qemu-devel, quintela; +Cc: QEMU Trivial
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>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mingw: Fix builds on f33 mingw
2020-10-08 17:43 [PATCH] mingw: Fix builds on f33 mingw Dr. David Alan Gilbert (git)
2020-10-08 17:46 ` Thomas Huth
@ 2020-10-08 17:49 ` Philippe Mathieu-Daudé
2020-10-08 17:50 ` Richard Henderson
2 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-08 17:49 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git), qemu-devel, quintela, thuth
On 10/8/20 7:43 PM, 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.
Marc-André sent the same fix:
https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg02191.html
>
> 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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mingw: Fix builds on f33 mingw
2020-10-08 17:43 [PATCH] mingw: Fix builds on f33 mingw Dr. David Alan Gilbert (git)
2020-10-08 17:46 ` Thomas Huth
2020-10-08 17:49 ` Philippe Mathieu-Daudé
@ 2020-10-08 17:50 ` Richard Henderson
2 siblings, 0 replies; 7+ messages in thread
From: Richard Henderson @ 2020-10-08 17:50 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git), qemu-devel, quintela, thuth
On 10/8/20 12:43 PM, Dr. David Alan Gilbert (git) wrote:
> -#include <stdlib.h>
> #include "qemu/osdep.h"
> +#include <stdlib.h>
As pointed out by pmm earlier, for someone else's version of this patch,
<stdlib.h> should simply be removed here -- it's already included by osdep.h.
r~
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mingw: Fix builds on f33 mingw
2020-10-08 17:46 ` Thomas Huth
@ 2020-10-12 14:35 ` Laurent Vivier
2020-10-12 15:05 ` Peter Maydell
0 siblings, 1 reply; 7+ messages in thread
From: Laurent Vivier @ 2020-10-12 14:35 UTC (permalink / raw)
To: Thomas Huth, Dr. David Alan Gilbert (git), qemu-devel, quintela
Cc: QEMU Trivial
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.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mingw: Fix builds on f33 mingw
2020-10-12 14:35 ` Laurent Vivier
@ 2020-10-12 15:05 ` Peter Maydell
2020-10-12 15:15 ` Laurent Vivier
0 siblings, 1 reply; 7+ messages in thread
From: Peter Maydell @ 2020-10-12 15:05 UTC (permalink / raw)
To: Laurent Vivier
Cc: QEMU Trivial, Thomas Huth, Juan Quintela,
Dr. David Alan Gilbert (git),
QEMU Developers
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mingw: Fix builds on f33 mingw
2020-10-12 15:05 ` Peter Maydell
@ 2020-10-12 15:15 ` Laurent Vivier
0 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2020-10-12 15:15 UTC (permalink / raw)
To: Peter Maydell
Cc: QEMU Trivial, Thomas Huth, QEMU Developers,
Dr. David Alan Gilbert (git),
Juan Quintela
Le 12/10/2020 à 17:05, Peter Maydell a écrit :
> 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?
Yes, queueing instead:
"[PATCH v2] mingw: fix error __USE_MINGW_ANSI_STDIO redefined"
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-10-12 15:16 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-08 17:43 [PATCH] mingw: Fix builds on f33 mingw Dr. David Alan Gilbert (git)
2020-10-08 17:46 ` Thomas Huth
2020-10-12 14:35 ` Laurent Vivier
2020-10-12 15:05 ` Peter Maydell
2020-10-12 15:15 ` Laurent Vivier
2020-10-08 17:49 ` Philippe Mathieu-Daudé
2020-10-08 17:50 ` Richard Henderson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.