| Message ID | 1525376963-79623-23-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | include path cleanup | expand |
On 05/03/2018 04:51 PM, Michael S. Tsirkin wrote: > 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 <mst@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > 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 */ >
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 */
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 <mst@redhat.com> --- 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(-)