aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2018-05-03 22:51:00 +0300
committerMichael S. Tsirkin <mst@redhat.com>2018-06-01 19:20:38 +0300
commit0041e9a0ac7f140256351a50b218f479981f06b2 (patch)
tree91d4f859b5a607a708e0727641dbbd91b21e83d2
parentdc03272da6d234a02b8caf938242d26584489e27 (diff)
downloadqemu-arm-0041e9a0ac7f140256351a50b218f479981f06b2.tar.gz
ui: use local path for local headers
When pulling in headers that are in the same directory as the C file (as opposed to one in include/), we should use its relative path, without a directory. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-rw-r--r--ui/gtk.c2
-rw-r--r--ui/input-keymap.c2
-rw-r--r--ui/input-legacy.c2
-rw-r--r--ui/spice-input.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk.c b/ui/gtk.c
index dbce970dc4..903f136b8f 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -66,7 +66,7 @@
#define VC_SCALE_STEP 0.25
#ifdef GDK_WINDOWING_X11
-#include "ui/x_keymap.h"
+#include "x_keymap.h"
/* Gtk2 compat */
#ifndef GDK_IS_X11_DISPLAY
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 3d4e66bab5..87cc301b7a 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
#include "ui/input.h"
#include "standard-headers/linux/input.h"
diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index e5d4db1d97..549654e26a 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -26,7 +26,7 @@
#include "qapi/qapi-commands-ui.h"
#include "sysemu/sysemu.h"
#include "ui/console.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
#include "ui/input.h"
struct QEMUPutMouseEntry {
diff --git a/ui/spice-input.c b/ui/spice-input.c
index 3d41aa1831..a426c03b5e 100644
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -23,7 +23,7 @@
#include "qemu-common.h"
#include "ui/qemu-spice.h"
#include "ui/console.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
#include "ui/input.h"
/* keyboard bits */