mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move wl_priv_signal to wayland-server-private.h

Browse source 
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 <JPEWhacker@gmail.com>
This commit is contained in:
Joshua Watt 2019-11-05 09:09:50 -06:00
parent 4a1f348c20
commit e7d88f35eb
5 changed files with 58 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/wayland-private.h
View file

@ -31,11 +31,11 @@
#include <stdarg.h>
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
#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);