[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/67] ui: use local path for local headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH 22/67] ui: use local path for local headers |
Date: |
Thu, 3 May 2018 22:51:00 +0300 |
When pulling in headers that are in the same directory as C file (as
opposed to one in include/), we should use its relative path, without a
directory. Directory based path works more or less by accident.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
ui/gtk.c | 2 +-
ui/input-keymap.c | 2 +-
ui/input-legacy.c | 2 +-
ui/spice-input.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index bb3214c..e723304 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 3d4e66b..87cc301 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 e5d4db1..549654e 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 3d41aa1..a426c03 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 */
--
MST
- Re: [Qemu-devel] [PATCH 26/67] cpu: replace command line flags with preprocessor, (continued)
[Qemu-devel] [PATCH 16/67] migration: use local path for local headers, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 24/67] net: add include directory headers, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 22/67] ui: use local path for local headers,
Michael S. Tsirkin <=
[Qemu-devel] [PATCH 25/67] arch_init: sort architectures, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 28/67] 9pfs: add include directory headers, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 29/67] fsdev: add include directory headers, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 30/67] audio: add include directory header, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 35/67] hw/usb: add include directory header, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 33/67] hw/net: add include directory header, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 32/67] ui: add include directory header, Michael S. Tsirkin, 2018/05/03
[Qemu-devel] [PATCH 36/67] migration: add include directory headers, Michael S. Tsirkin, 2018/05/03