[Spice-devel] [PATCH 3/9] common: RFC: add windows.h where required, make gdi_handlers static

[Marc-André Lureau]

----- Original Message -----
> On Tue, Jan 25, 2011 at 07:17:22PM +0100, Marc-André Lureau wrote:
> > This patch has not been verified. Somebody with VS should check if
> > it
> > still compiles and run fine before applying it.
> 
> Making gdi_handlers makes a lot of sense to me. I couldn't find on
> google
> or with git grep anything that would indicate that gdi_handlers is
> magic in
> anyway, so this part of the patch looks good to me. I'm not sure why
> you
> needed to add some #include <windows.h> in a few headers?

Because those files use Windows API (and I remember they failed to compile with spice-gtk/mingw).

-- 
Marc-André Lureau

> 
> Christophe
> 
> > ---
> >  client/windows/platform.cpp | 1 -
> >  common/canvas_base.h | 3 +++
> >  common/canvas_utils.c | 2 +-
> >  common/canvas_utils.h | 4 ++++
> >  4 files changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/client/windows/platform.cpp
> > b/client/windows/platform.cpp
> > index c41c39a..ac6fd91 100644
> > --- a/client/windows/platform.cpp
> > +++ b/client/windows/platform.cpp
> > @@ -42,7 +42,6 @@
> >  #endif
> >  #include <spice/vd_agent.h>
> >
> > -int gdi_handlers = 0;
> >  extern HINSTANCE instance;
> >
> >  class DefaultEventListener: public Platform::EventListener {
> > diff --git a/common/canvas_base.h b/common/canvas_base.h
> > index 2166dcf..bea041f 100644
> > --- a/common/canvas_base.h
> > +++ b/common/canvas_base.h
> > @@ -24,6 +24,9 @@
> >  #include "lz.h"
> >  #include "region.h"
> >  #include "draw.h"
> > +#ifdef WIN32
> > +#include <windows.h>
> > +#endif
> >
> >  typedef void (*spice_destroy_fn_t)(void *data);
> >
> > diff --git a/common/canvas_utils.c b/common/canvas_utils.c
> > index 020b23c..743c86c 100644
> > --- a/common/canvas_utils.c
> > +++ b/common/canvas_utils.c
> > @@ -27,7 +27,7 @@
> >  #include "mem.h"
> >
> >  #ifdef WIN32
> > -extern int gdi_handlers;
> > +static int gdi_handlers = 0;
> >  #endif
> >
> >  #ifndef ASSERT
> > diff --git a/common/canvas_utils.h b/common/canvas_utils.h
> > index b87b816..fe66f85 100644
> > --- a/common/canvas_utils.h
> > +++ b/common/canvas_utils.h
> > @@ -19,6 +19,10 @@
> >  #ifndef _H_CANVAS_UTILS
> >  #define _H_CANVAS_UTILS
> >
> > +#ifdef WIN32
> > +#include <windows.h>
> > +#endif
> > +
> >  #include <spice/types.h>
> >
> >  #include "pixman_utils.h"
> > --
> > 1.7.3.4
> >
> >