From 48b39d31ef4d6b0f755122426501f0dd685f4096 Mon Sep 17 00:00:00 2001 From: Michael Tretter Date: Wed, 13 Apr 2022 17:27:55 +0200 Subject: [PATCH] shared: extract hash table implementation from xwayland The hash table implementation is useful for other modules as well. Move it from xwayland to the shared code. Signed-off-by: Michael Tretter --- {xwayland => shared}/hash.c | 0 {xwayland => shared}/hash.h | 0 shared/meson.build | 1 + xwayland/dnd.c | 2 +- xwayland/meson.build | 1 - xwayland/window-manager.c | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename {xwayland => shared}/hash.c (100%) rename {xwayland => shared}/hash.h (100%) diff --git a/xwayland/hash.c b/shared/hash.c similarity index 100% rename from xwayland/hash.c rename to shared/hash.c diff --git a/xwayland/hash.h b/shared/hash.h similarity index 100% rename from xwayland/hash.h rename to shared/hash.h diff --git a/shared/meson.build b/shared/meson.build index 8ed3c0a0..cbf39c35 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -5,6 +5,7 @@ srcs_libshared = [ 'file-util.c', 'os-compatibility.c', 'process-util.c', + 'hash.c', ] deps_libshared = [dep_wayland_client, dep_wayland_server, dep_pixman] diff --git a/xwayland/dnd.c b/xwayland/dnd.c index 01918e16..f8fab329 100644 --- a/xwayland/dnd.c +++ b/xwayland/dnd.c @@ -40,7 +40,7 @@ #include #include "xwayland.h" -#include "hash.h" +#include "shared/hash.h" struct dnd_data_source { struct weston_data_source base; diff --git a/xwayland/meson.build b/xwayland/meson.build index a7b3e40c..d114ede3 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -14,7 +14,6 @@ srcs_xwayland = [ 'window-manager.c', 'selection.c', 'dnd.c', - 'hash.c', ] dep_names_xwayland = [ diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c index c43ee8d4..cb17f52d 100644 --- a/xwayland/window-manager.c +++ b/xwayland/window-manager.c @@ -46,7 +46,7 @@ #include "xwayland-internal-interface.h" #include "shared/cairo-util.h" -#include "hash.h" +#include "shared/hash.h" #include "shared/helpers.h" #include "shared/xcb-xwayland.h"