[libvirt] [PATCH] domsuspend: Fix warning on mingw build
Andrea Bolognani
abologna at redhat.com
Fri Feb 12 15:37:16 UTC 2016
On Fri, 2016-02-12 at 16:32 +0100, Michal Privoznik wrote:
> On 10.02.2016 19:44, Andrea Bolognani wrote:
> > Commit d82170d introduced a workaround for domtop: in that example
> > program, we define a symbol called ERROR for our own use, but since
> > a symbol with the same name is already defined in one of mingw's
> > header files, we get a warning when using that compiler.
> >
> > domsuspend defines the same problematic symbol, so the workaround
> > has been copied over.
> > ---
> > examples/domsuspend/suspend.c | 15 +++++++++++++++
> > 1 file changed, 15 insertions(+)
> >
> > diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c
> > index 11f7302..3e3f70e 100644
> > --- a/examples/domsuspend/suspend.c
> > +++ b/examples/domsuspend/suspend.c
> > @@ -34,6 +34,21 @@
> >
> > static int debug;
> >
> > +/* On mingw, there's a header file that poisons the well:
> > + *
> > + *
> > + * CC domtop.o
> > + *domtop.c:40:0: warning: "ERROR" redefined [enabled by default]
> > + * #define ERROR(...) \
> > + * ^
> > + *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0,
> > + * from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23,
> > + * from ../../gnulib/lib/unistd.h:48,
> > + * from domtop.c:35:
> > + * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous
> > definition
> > + * #define ERROR 0
> > + */
> > +#undef ERROR
> > #define ERROR(...) \
> > do { \
> > fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \
> >
>
> ACK
Pushed, thanks.
--
Andrea Bolognani
Software Engineer - Virtualization Team
More information about the libvir-list
mailing list