From bfbb95674baee1b7fb938e71012db35b39531fc3 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 17 May 2020 14:38:20 +0200 Subject: [PATCH] app/internal/window: [Wayland] fold os_wayland.h into os_wayland.go preamble Signed-off-by: Elias Naur --- app/internal/window/os_wayland.c | 1 - app/internal/window/os_wayland.go | 14 +++++++++++++- app/internal/window/os_wayland.h | 14 -------------- 3 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 app/internal/window/os_wayland.h diff --git a/app/internal/window/os_wayland.c b/app/internal/window/os_wayland.c index a747facc..e65051d8 100644 --- a/app/internal/window/os_wayland.c +++ b/app/internal/window/os_wayland.c @@ -5,7 +5,6 @@ #include #include "wayland_xdg_shell.h" #include "wayland_text_input.h" -#include "os_wayland.h" #include "_cgo_export.h" void gio_wl_registry_add_listener(struct wl_registry *reg, void *data) { diff --git a/app/internal/window/os_wayland.go b/app/internal/window/os_wayland.go index ff422c96..8eefa06e 100644 --- a/app/internal/window/os_wayland.go +++ b/app/internal/window/os_wayland.go @@ -51,7 +51,19 @@ import ( #include "wayland_text_input.h" #include "wayland_xdg_shell.h" #include "wayland_xdg_decoration.h" -#include "os_wayland.h" + +__attribute__ ((visibility ("hidden"))) void gio_wl_registry_add_listener(struct wl_registry *reg, void *data); +__attribute__ ((visibility ("hidden"))) void gio_wl_surface_add_listener(struct wl_surface *surface, void *data); +__attribute__ ((visibility ("hidden"))) void gio_xdg_surface_add_listener(struct xdg_surface *surface, void *data); +__attribute__ ((visibility ("hidden"))) void gio_xdg_toplevel_add_listener(struct xdg_toplevel *toplevel, void *data); +__attribute__ ((visibility ("hidden"))) void gio_xdg_wm_base_add_listener(struct xdg_wm_base *wm, void *data); +__attribute__ ((visibility ("hidden"))) void gio_wl_callback_add_listener(struct wl_callback *callback, void *data); +__attribute__ ((visibility ("hidden"))) void gio_wl_output_add_listener(struct wl_output *output, void *data); +__attribute__ ((visibility ("hidden"))) void gio_wl_seat_add_listener(struct wl_seat *seat, void *data); +__attribute__ ((visibility ("hidden"))) void gio_wl_pointer_add_listener(struct wl_pointer *pointer, void *data); +__attribute__ ((visibility ("hidden"))) void gio_wl_touch_add_listener(struct wl_touch *touch, void *data); +__attribute__ ((visibility ("hidden"))) void gio_wl_keyboard_add_listener(struct wl_keyboard *keyboard, void *data); +__attribute__ ((visibility ("hidden"))) void gio_zwp_text_input_v3_add_listener(struct zwp_text_input_v3 *im, void *data); */ import "C" diff --git a/app/internal/window/os_wayland.h b/app/internal/window/os_wayland.h deleted file mode 100644 index 049fb0bf..00000000 --- a/app/internal/window/os_wayland.h +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: Unlicense OR MIT - -__attribute__ ((visibility ("hidden"))) void gio_wl_registry_add_listener(struct wl_registry *reg, void *data); -__attribute__ ((visibility ("hidden"))) void gio_wl_surface_add_listener(struct wl_surface *surface, void *data); -__attribute__ ((visibility ("hidden"))) void gio_xdg_surface_add_listener(struct xdg_surface *surface, void *data); -__attribute__ ((visibility ("hidden"))) void gio_xdg_toplevel_add_listener(struct xdg_toplevel *toplevel, void *data); -__attribute__ ((visibility ("hidden"))) void gio_xdg_wm_base_add_listener(struct xdg_wm_base *wm, void *data); -__attribute__ ((visibility ("hidden"))) void gio_wl_callback_add_listener(struct wl_callback *callback, void *data); -__attribute__ ((visibility ("hidden"))) void gio_wl_output_add_listener(struct wl_output *output, void *data); -__attribute__ ((visibility ("hidden"))) void gio_wl_seat_add_listener(struct wl_seat *seat, void *data); -__attribute__ ((visibility ("hidden"))) void gio_wl_pointer_add_listener(struct wl_pointer *pointer, void *data); -__attribute__ ((visibility ("hidden"))) void gio_wl_touch_add_listener(struct wl_touch *touch, void *data); -__attribute__ ((visibility ("hidden"))) void gio_wl_keyboard_add_listener(struct wl_keyboard *keyboard, void *data); -__attribute__ ((visibility ("hidden"))) void gio_zwp_text_input_v3_add_listener(struct zwp_text_input_v3 *im, void *data);