[PATCH wayland v2 3/3] wayland-egl: add a core header

[Pekka Paalanen]

On Tue, 28 Apr 2015 22:57:18 +0300
Giulio Camuffo <giuliocamuffo at gmail.com> wrote:

> The new core header doesn't include any other header, since it really
> is not needed.
> ---
>  Makefile.am            |  1 +
>  src/wayland-egl-core.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  src/wayland-egl.h      | 29 +-------------------------
>  3 files changed, 58 insertions(+), 28 deletions(-)
>  create mode 100644 src/wayland-egl-core.h
> 
> diff --git a/Makefile.am b/Makefile.am
> index a8a0a56..5b44d6f 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -25,6 +25,7 @@ include_HEADERS =				\
>  	src/wayland-client.h			\
>  	src/wayland-client-core.h		\
>  	src/wayland-egl.h			\
> +	src/wayland-egl-core.h			\
>  	src/wayland-version.h
>  
>  nodist_include_HEADERS =			\
> diff --git a/src/wayland-egl-core.h b/src/wayland-egl-core.h
> new file mode 100644
> index 0000000..c730d9e
> --- /dev/null
> +++ b/src/wayland-egl-core.h
> @@ -0,0 +1,56 @@
> +/*
> + * Copyright © 2011 Kristian Høgsberg
> + * Copyright © 2011 Benjamin Franzke
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and its
> + * documentation for any purpose is hereby granted without fee, provided that
> + * the above copyright notice appear in all copies and that both that copyright
> + * notice and this permission notice appear in supporting documentation, and
> + * that the name of the copyright holders not be used in advertising or
> + * publicity pertaining to distribution of the software without specific,
> + * written prior permission.  The copyright holders make no representations
> + * about the suitability of this software for any purpose.  It is provided "as
> + * is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
> + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
> + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
> + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
> + * OF THIS SOFTWARE.
> + */
> +
> +#ifndef WAYLAND_EGL_CORE_H
> +#define WAYLAND_EGL_CORE_H
> +
> +#ifdef  __cplusplus
> +extern "C" {
> +#endif
> +
> +#define WL_EGL_PLATFORM 1
> +
> +struct wl_egl_window;
> +struct wl_surface;
> +
> +struct wl_egl_window *
> +wl_egl_window_create(struct wl_surface *surface,
> +		     int width, int height);
> +
> +void
> +wl_egl_window_destroy(struct wl_egl_window *egl_window);
> +
> +void
> +wl_egl_window_resize(struct wl_egl_window *egl_window,
> +		     int width, int height,
> +		     int dx, int dy);
> +
> +void
> +wl_egl_window_get_attached_size(struct wl_egl_window *egl_window,
> +				int *width, int *height);
> +
> +#ifdef  __cplusplus
> +}
> +#endif
> +
> +#endif
> diff --git a/src/wayland-egl.h b/src/wayland-egl.h
> index c40280b..075009f 100644
> --- a/src/wayland-egl.h
> +++ b/src/wayland-egl.h
> @@ -24,34 +24,7 @@
>  #ifndef WAYLAND_EGL_H
>  #define WAYLAND_EGL_H
>  
> -#ifdef  __cplusplus
> -extern "C" {
> -#endif
> -
>  #include <wayland-client.h>
> -
> -#define WL_EGL_PLATFORM 1
> -
> -struct wl_egl_window;
> -
> -struct wl_egl_window *
> -wl_egl_window_create(struct wl_surface *surface,
> -		     int width, int height);
> -
> -void
> -wl_egl_window_destroy(struct wl_egl_window *egl_window);
> -
> -void
> -wl_egl_window_resize(struct wl_egl_window *egl_window,
> -		     int width, int height,
> -		     int dx, int dy);
> -
> -void
> -wl_egl_window_get_attached_size(struct wl_egl_window *egl_window,
> -				int *width, int *height);
> -
> -#ifdef  __cplusplus
> -}
> -#endif
> +#include "wayland-egl-core.h"

Hmm, that looks funny:

#include <wayland-client.h>
#include "wayland-egl-core.h"

I think the wayland-client.h should be in "" to match the style of
every other include in the wayland headers, but fixing that should be a
separate patch. Reading cpp.info, "" is correct.

Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>


Thanks,
pq