[PATCH] Fix inconsistent #include style

Tiago Vignatti tiago.vignatti at linux.intel.com
Tue Nov 22 04:24:40 PST 2011


Consistency is needed but the question is, why was it compiling before 
then? You didn't addressed the root cause.

        Tiago

On 11/22/2011 02:18 PM, Pekka Paalanen wrote:
> Signed-off-by: Pekka Paalanen<ppaalanen at gmail.com>
> ---
>   clients/config.c        |    2 +-
>   clients/desktop-shell.c |    4 ++--
>   clients/dnd.c           |    2 +-
>   clients/flower.c        |    2 +-
>   clients/gears.c         |    2 +-
>   clients/image.c         |    2 +-
>   clients/resizor.c       |    2 +-
>   clients/screenshot.c    |    2 +-
>   clients/smoke.c         |    2 +-
>   clients/terminal.c      |    2 +-
>   clients/view.c          |    2 +-
>   clients/window.c        |    2 +-
>   compositor/compositor.c |    2 +-
>   compositor/compositor.h |    2 +-
>   compositor/shell.c      |    2 +-
>   15 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/clients/config.c b/clients/config.c
> index 5680d50..69edbc6 100644
> --- a/clients/config.c
> +++ b/clients/config.c
> @@ -25,7 +25,7 @@
>   #include<stdlib.h>
>   #include<assert.h>
>
> -#include<window.h>
> +#include "window.h"
>
>   static int
>   handle_key(const struct config_key *key, const char *value)
> diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
> index adf3a5c..3cca520 100644
> --- a/clients/desktop-shell.c
> +++ b/clients/desktop-shell.c
> @@ -32,11 +32,11 @@
>   #include<sys/wait.h>
>   #include<linux/input.h>
>
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>   #include "cairo-util.h"
>   #include "window.h"
>
> -#include<desktop-shell-client-protocol.h>
> +#include "desktop-shell-client-protocol.h"
>
>   struct desktop {
>   	struct display *display;
> diff --git a/clients/dnd.c b/clients/dnd.c
> index 5bfe31c..db794fd 100644
> --- a/clients/dnd.c
> +++ b/clients/dnd.c
> @@ -32,7 +32,7 @@
>   #include<sys/epoll.h>
>   #include<gdk-pixbuf/gdk-pixbuf.h>
>
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>
>   #include "window.h"
>   #include "cairo-util.h"
> diff --git a/clients/flower.c b/clients/flower.c
> index 5ad58f1..7743b44 100644
> --- a/clients/flower.c
> +++ b/clients/flower.c
> @@ -33,7 +33,7 @@
>   #include<sys/time.h>
>   #include<glib.h>
>
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>   #include "window.h"
>
>   static void
> diff --git a/clients/gears.c b/clients/gears.c
> index 6af505b..1f3ab7d 100644
> --- a/clients/gears.c
> +++ b/clients/gears.c
> @@ -37,7 +37,7 @@
>   #include<EGL/eglext.h>
>
>   #include "wayland-util.h"
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>
>   #include "window.h"
>
> diff --git a/clients/image.c b/clients/image.c
> index 51ce1f0..13115d2 100644
> --- a/clients/image.c
> +++ b/clients/image.c
> @@ -33,7 +33,7 @@
>   #include<glib.h>
>   #include<gdk-pixbuf/gdk-pixbuf.h>
>
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>
>   #include "window.h"
>
> diff --git a/clients/resizor.c b/clients/resizor.c
> index e48095f..ede9429 100644
> --- a/clients/resizor.c
> +++ b/clients/resizor.c
> @@ -28,7 +28,7 @@
>   #include<math.h>
>
>   #include "wayland-util.h"
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>
>   #include "window.h"
>
> diff --git a/clients/screenshot.c b/clients/screenshot.c
> index 124e576..bfe5ea0 100644
> --- a/clients/screenshot.c
> +++ b/clients/screenshot.c
> @@ -30,7 +30,7 @@
>   #include<glib.h>
>   #include<gdk-pixbuf/gdk-pixbuf.h>
>
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>   #include "screenshooter-client-protocol.h"
>
>   /* The screenshooter is a good example of a custom object exposed by
> diff --git a/clients/smoke.c b/clients/smoke.c
> index 061bd6d..6ceade0 100644
> --- a/clients/smoke.c
> +++ b/clients/smoke.c
> @@ -32,7 +32,7 @@
>   #include<cairo.h>
>   #include<glib.h>
>
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>   #include "window.h"
>
>   struct smoke {
> diff --git a/clients/terminal.c b/clients/terminal.c
> index 092e069..df2f8c7 100644
> --- a/clients/terminal.c
> +++ b/clients/terminal.c
> @@ -37,7 +37,7 @@
>   #include<X11/keysym.h>
>
>   #include "wayland-util.h"
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>
>   #include "window.h"
>
> diff --git a/clients/view.c b/clients/view.c
> index 0eec1f9..f5f8841 100644
> --- a/clients/view.c
> +++ b/clients/view.c
> @@ -38,7 +38,7 @@
>   #include<glib/poppler-page.h>
>
>   #include "wayland-util.h"
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>
>   #include "window.h"
>
> diff --git a/clients/window.c b/clients/window.c
> index 16322ff..a0c09c8 100644
> --- a/clients/window.c
> +++ b/clients/window.c
> @@ -51,7 +51,7 @@
>
>   #include<linux/input.h>
>   #include "wayland-util.h"
> -#include "wayland-client.h"
> +#include<wayland-client.h>
>   #include "cairo-util.h"
>
>   #include "window.h"
> diff --git a/compositor/compositor.c b/compositor/compositor.c
> index 9b32eff..fe123f8 100644
> --- a/compositor/compositor.c
> +++ b/compositor/compositor.c
> @@ -42,7 +42,7 @@
>   #include<getopt.h>
>   #include<signal.h>
>
> -#include "wayland-server.h"
> +#include<wayland-server.h>
>   #include "compositor.h"
>
>   /* The plan here is to generate a random anonymous socket name and
> diff --git a/compositor/compositor.h b/compositor/compositor.h
> index c61e697..30fb5cb 100644
> --- a/compositor/compositor.h
> +++ b/compositor/compositor.h
> @@ -25,7 +25,7 @@
>
>   #include<libudev.h>
>   #include<pixman.h>
> -#include "wayland-server.h"
> +#include<wayland-server.h>
>   #include "wayland-util.h"
>
>   #include<GLES2/gl2.h>
> diff --git a/compositor/shell.c b/compositor/shell.c
> index 7bae944..f8305db 100644
> --- a/compositor/shell.c
> +++ b/compositor/shell.c
> @@ -32,7 +32,7 @@
>   #include<fcntl.h>
>   #include<assert.h>
>
> -#include "wayland-server.h"
> +#include<wayland-server.h>
>   #include "compositor.h"
>   #include "desktop-shell-server-protocol.h"
>



More information about the wayland-devel mailing list