From 88f742894d89edbe4506e8cf765aa0accbee1d09 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 14 Jul 2020 14:32:37 +0200 Subject: [PATCH] Move wayland header to input/common --- gfx/drivers_context/wayland_ctx.c | 2 +- {gfx => input}/common/wayland_common.h | 6 +++--- input/drivers/wayland_input.c | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) rename {gfx => input}/common/wayland_common.h (94%) diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index f6368705a3..5fc73f6be0 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -42,8 +42,8 @@ #include "../common/gl_common.h" #endif -#include "../common/wayland_common.h" #include "../../frontend/frontend_driver.h" +#include "../../input/common/wayland_common.h" #include "../../input/input_driver.h" #include "../../input/input_keymaps.h" #include "../../verbosity.h" diff --git a/gfx/common/wayland_common.h b/input/common/wayland_common.h similarity index 94% rename from gfx/common/wayland_common.h rename to input/common/wayland_common.h index 941da1defa..a496ef9467 100644 --- a/gfx/common/wayland_common.h +++ b/input/common/wayland_common.h @@ -13,8 +13,8 @@ * If not, see . */ -#ifndef WAYLAND_COMMON_H__ -#define WAYLAND_COMMON_H__ +#ifndef WAYLAND_INPUT_COMMON_H__ +#define WAYLAND_INPUT_COMMON_H__ #include #include @@ -23,7 +23,7 @@ #include #include -#include "../../input/input_driver.h" +#include "../input_driver.h" #define UDEV_KEY_MAX 0x2ff #define UDEV_MAX_KEYS (UDEV_KEY_MAX + 7) / 8 diff --git a/input/drivers/wayland_input.c b/input/drivers/wayland_input.c index fc78b8402c..d4f63fdb99 100644 --- a/input/drivers/wayland_input.c +++ b/input/drivers/wayland_input.c @@ -40,8 +40,7 @@ #include "../input_keymaps.h" #include "../common/linux_common.h" - -#include "../../gfx/common/wayland_common.h" +#include "../common/wayland_common.h" #include "../../retroarch.h" #include "../../verbosity.h"