> On Sat, Dec 22, 2018 at 09:27:02AM -0500, Frediano Ziglio wrote: > > > > > On Fri, Dec 21, 2018 at 4:04 PM Frediano Ziglio <fziglio@xxxxxxxxxx> > > > wrote: > > > > > > > > Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx> > > > > > > I would suggest to wrap with #if _WIN32, otherwise it's really weird > > > to see those undef without context. > > > > > > > Done, also added a comment like > > > > @@ -39,7 +39,10 @@ > > > > #include "red-qxl.h" > > > > +#ifdef _WIN32 > > +// undefine conflicting preprocessor macros > > #undef interface > > +#endif > > I haven't even been able to figure out where 'interface' is defined in > our code? Is it windows headers defining 'interface' and 'MAX_MONITORS'? > The commit log could contain a few more details. > > Christophe > Just "grep -rw interface server/", there are plenty in reds.c. What about: "interface" and "MAX_MONITORS" are defined in some Windows system headers causing garbage code to be fed to the compiler. Frediano > > > > struct QXLState { > > QXLWorker qxl_worker; > > > > > > > > > > > --- > > > > server/red-qxl.c | 1 + > > > > server/reds.c | 3 +++ > > > > 2 files changed, 4 insertions(+) > > > > > > > > diff --git a/server/red-qxl.c b/server/red-qxl.c > > > > index cec3eefb..886bf9f5 100644 > > > > --- a/server/red-qxl.c > > > > +++ b/server/red-qxl.c > > > > @@ -39,6 +39,7 @@ > > > > > > > > #include "red-qxl.h" > > > > > > > > +#undef interface > > > > > > > > struct QXLState { > > > > QXLWorker qxl_worker; > > > > diff --git a/server/reds.c b/server/reds.c > > > > index faa62ede..2897aecb 100644 > > > > --- a/server/reds.c > > > > +++ b/server/reds.c > > > > @@ -79,6 +79,9 @@ > > > > #include "net-utils.h" > > > > #include "red-stream-device.h" > > > > > > > > +#undef MAX_MONITORS > > > > +#undef interface > > > > + > > > > #define REDS_MAX_STAT_NODES 100 > > > > > > > > static void reds_client_monitors_config(RedsState *reds, > > > > VDAgentMonitorsConfig *monitors_config); > > _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel