[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/31] ui: use local path for local headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 26/31] ui: use local path for local headers |
Date: |
Fri, 1 Jun 2018 19:27:24 +0300 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <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 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 */
--
MST
- [Qemu-devel] [PULL 18/31] rocker: drop an unused include, (continued)
- [Qemu-devel] [PULL 18/31] rocker: drop an unused include, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 19/31] ppc: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 15/31] ide: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 21/31] sd: fix up include, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 22/31] usb: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 24/31] colo: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 25/31] qga: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 27/31] arch_init: sort architectures, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 28/31] tests/.gitignore: add entry for generated file, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 29/31] nvdimm, acpi: support NFIT platform capabilities, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 26/31] ui: use local path for local headers,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 23/31] migration: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 30/31] ACPI testing: test NFIT platform capabilities, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 31/31] vhost-blk: turn on pre-defined RO feature bit, Michael S. Tsirkin, 2018/06/01
- Re: [Qemu-devel] [PULL 00/31] acpi, vhost, misc: fixes, features, Peter Maydell, 2018/06/04
- Re: [Qemu-devel] [PULL 00/31] acpi, vhost, misc: fixes, features, Philippe Mathieu-Daudé, 2018/06/08
- Re: [Qemu-devel] [PULL 00/31] acpi, vhost, misc: fixes, features, Philippe Mathieu-Daudé, 2018/06/08
- Re: [Qemu-devel] [PULL 00/31] acpi, vhost, misc: fixes, features, Peter Maydell, 2018/06/09
- Re: [Qemu-devel] [PULL 00/31] acpi, vhost, misc: fixes, features, Thomas Huth, 2018/06/06