[PATCH weston] move subsurface-server-protocol.h include out of compositor.h

Pekka Paalanen ppaalanen at gmail.com
Mon May 13 22:46:41 PDT 2013


On Mon, 13 May 2013 15:55:47 -0700
"U. Artie Eoff" <ullysses.a.eoff at intel.com> wrote:

> From: "U. Artie Eoff" <ullysses.a.eoff at intel.com>
> 
> The subsurface-server-protocol.h header should not be included
> by any headers that are part of the SDK since it is not exported.
> Otherwise, SDK consumers will break during compilation.
> 
> Move this include from compositor.h to compositor.c.
> 
> Fixes https://bugs.freedesktop.org/show_bug.cgi?id=64537
> 
> Signed-off-by: U. Artie Eoff <ullysses.a.eoff at intel.com>
> ---
>  src/compositor.c | 1 +
>  src/compositor.h | 1 -
>  2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/compositor.c b/src/compositor.c
> index c1f90ca..c16bf0c 100644
> --- a/src/compositor.c
> +++ b/src/compositor.c
> @@ -56,6 +56,7 @@
>  
>  #include <wayland-server.h>
>  #include "compositor.h"
> +#include "subsurface-server-protocol.h"
>  #include "../shared/os-compatibility.h"
>  #include "git-version.h"
>  #include "version.h"
> diff --git a/src/compositor.h b/src/compositor.h
> index d7aa005..99468a1 100644
> --- a/src/compositor.h
> +++ b/src/compositor.h
> @@ -35,7 +35,6 @@ extern "C" {
>  #include "version.h"
>  #include "matrix.h"
>  #include "config-parser.h"
> -#include "subsurface-server-protocol.h"
>  
>  #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
>  

Looks good to me!

Thanks for fixing this,
pq


More information about the wayland-devel mailing list