mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04: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

3
Makefile.am
View file

@ -56,7 +56,8 @@ libwayland_private_la_SOURCES = \
src/connection.c \
src/wayland-os.c \
src/wayland-os.h \
src/wayland-private.h
src/wayland-private.h \
src/wayland-server-private.h
include_HEADERS = \
src/wayland-util.h \

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);

53
src/wayland-server-private.h Normal file
View file

@ -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

1
src/wayland-server.c
View file

@ -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"

2
tests/newsignal-test.c
View file

@ -26,7 +26,7 @@
#include <assert.h>
#include "test-runner.h"
#include "wayland-private.h"
#include "wayland-server-private.h"
static void
signal_notify(struct wl_listener *listener, void *data)