summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tretter <m.tretter@pengutronix.de>2022-04-13 17:27:55 +0200
committerDaniel Stone <daniels@collabora.com>2023-03-03 08:08:46 +0000
commit48b39d31ef4d6b0f755122426501f0dd685f4096 (patch)
tree8401bd1a402707e2734ea6ed185e0f7c94dc7bcc
parentf05029127cd17daa4a50c1eba00824dc9063a19e (diff)
downloadweston-48b39d31ef4d6b0f755122426501f0dd685f4096.tar.gz
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 <m.tretter@pengutronix.de>
-rw-r--r--shared/hash.c (renamed from xwayland/hash.c)0
-rw-r--r--shared/hash.h (renamed from xwayland/hash.h)0
-rw-r--r--shared/meson.build1
-rw-r--r--xwayland/dnd.c2
-rw-r--r--xwayland/meson.build1
-rw-r--r--xwayland/window-manager.c2
6 files changed, 3 insertions, 3 deletions
diff --git a/xwayland/hash.c b/shared/hash.c
index 820e51fa..820e51fa 100644
--- a/xwayland/hash.c
+++ b/shared/hash.c
diff --git a/xwayland/hash.h b/shared/hash.h
index 334d8f47..334d8f47 100644
--- a/xwayland/hash.h
+++ b/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 <libweston/libweston.h>
#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"