[PATCH xwayland 1/2] Include xorg-server.h from xorg-config.h

Kristian Høgsberg hoegsberg at gmail.com
Fri Sep 13 15:05:27 PDT 2013


On Fri, Sep 13, 2013 at 02:41:02PM -0700, Kristian Høgsberg wrote:
> On Fri, Sep 13, 2013 at 03:52:29PM +0200, Giovanni Campagna wrote:
> > From: Giovanni Campagna <gcampagn at redhat.com>
> > 
> > This makes sure that all defines in the public headers (in
> > particular XORG_WAYLAND) are visible to source files that
> > only include xorg-config.h
> 
> What we do in this case is that we manually duplicate symbols that we
> want to appear in both xorg-server.h and xorg-config.h.  Also, we
> should be including xorg-config.h from all xwayland files, not
> xorg-server.h
> 
> Kristian

I went ahead and did this and committed the result, keeping you as
author, hope that's ok.

Kristian

> > ---
> >  include/xorg-config.h.in | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
> > index 0df31ae..fa30290 100644
> > --- a/include/xorg-config.h.in
> > +++ b/include/xorg-config.h.in
> > @@ -11,6 +11,7 @@
> >  
> >  #include <dix-config.h>
> >  #include <xkb-config.h>
> > +#include <xorg-server.h>
> >  
> >  /* Building Xorg server. */
> >  #undef XORGSERVER
> > -- 
> > 1.8.3.1
> > 
> > _______________________________________________
> > wayland-devel mailing list
> > wayland-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list