From e7d88f35eb89cf0cc77cbddd834cacc63683a9cc Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Tue, 5 Nov 2019 09:09:50 -0600 Subject: Move wl_priv_signal to wayland-server-private.h Including wayland-server-core.h in wayland-private.h is problematic because wayland-private.h is included by wayland-scanner which should be able to build against non-POSIX platforms (e.g. MinGW). The only reason that wayland-server-core.h was included in wayland-private.h was for the wl_private_signal definitions, so move those to a wayland-server-private.h file that can be included by both wayland-server.c and the tests. Signed-off-by: Joshua Watt --- src/wayland-private.h | 22 +----------------- src/wayland-server-private.h | 53 ++++++++++++++++++++++++++++++++++++++++++++ src/wayland-server.c | 1 + 3 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 src/wayland-server-private.h (limited to 'src') diff --git a/src/wayland-private.h b/src/wayland-private.h index 8a97fab..9bf8cb7 100644 --- a/src/wayland-private.h +++ b/src/wayland-private.h @@ -31,11 +31,11 @@ #include #include #include +#include #define WL_HIDE_DEPRECATED 1 #include "wayland-util.h" -#include "wayland-server-core.h" /* Invalid memory address */ #define WL_ARRAY_POISON_PTR (void *) 4 @@ -232,26 +232,6 @@ zalloc(size_t s) return calloc(1, s); } -struct wl_priv_signal { - struct wl_list listener_list; - struct wl_list emit_list; -}; - -void -wl_priv_signal_init(struct wl_priv_signal *signal); - -void -wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); - -struct wl_listener * -wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); - -void -wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); - -void -wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); - void wl_connection_close_fds_in(struct wl_connection *connection, int max); diff --git a/src/wayland-server-private.h b/src/wayland-server-private.h new file mode 100644 index 0000000..23fa458 --- /dev/null +++ b/src/wayland-server-private.h @@ -0,0 +1,53 @@ +/* + * Copyright © 2008-2011 Kristian Høgsberg + * Copyright © 2011 Intel Corporation + * Copyright © 2013 Jason Ekstrand + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef WAYLAND_SERVER_PRIVATE_H +#define WAYLAND_SERVER_PRIVATE_H + +#include "wayland-server-core.h" + +struct wl_priv_signal { + struct wl_list listener_list; + struct wl_list emit_list; +}; + +void +wl_priv_signal_init(struct wl_priv_signal *signal); + +void +wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); + +struct wl_listener * +wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); + +void +wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); + +void +wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); + +#endif diff --git a/src/wayland-server.c b/src/wayland-server.c index 5f466a0..3f48dfe 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -46,6 +46,7 @@ #include "wayland-util.h" #include "wayland-private.h" +#include "wayland-server-private.h" #include "wayland-server.h" #include "wayland-os.h" -- cgit v1.2.3-70-g09d2