commit 68b74ad0020f3bdeed12cf5140b94653b76d09b5
parent 51f7496a92e8f32a9f8c1924f0d63723530df540
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 25 Nov 2013 02:03:32 -0800
Sort local includes
Diffstat:
17 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/libswc/compositor.c b/libswc/compositor.c
@@ -1,12 +1,12 @@
#include "swc.h"
+#include "binding.h"
#include "compositor.h"
#include "compositor_surface.h"
#include "cursor_surface.h"
+#include "data_device_manager.h"
#include "output.h"
-#include "surface.h"
#include "region.h"
-#include "data_device_manager.h"
-#include "binding.h"
+#include "surface.h"
#include "util.h"
#include <stdlib.h>
diff --git a/libswc/data_device_manager.c b/libswc/data_device_manager.c
@@ -22,8 +22,8 @@
*/
#include "data_device_manager.h"
-#include "data_device.h"
#include "data.h"
+#include "data_device.h"
#include "seat.h"
static void create_data_source(struct wl_client * client,
diff --git a/libswc/drm.c b/libswc/drm.c
@@ -23,8 +23,8 @@
#include "drm.h"
#include "drm_buffer.h"
-#include "output.h"
#include "event.h"
+#include "output.h"
#include "private.h"
#include <stdio.h>
diff --git a/libswc/evdev_device.c b/libswc/evdev_device.c
@@ -1,7 +1,6 @@
#include "evdev_device.h"
-
-#include "seat.h"
#include "event.h"
+#include "seat.h"
#include "util.h"
#include <stdlib.h>
diff --git a/libswc/input_focus.c b/libswc/input_focus.c
@@ -22,9 +22,9 @@
*/
#include "input_focus.h"
+#include "event.h"
#include "surface.h"
#include "util.h"
-#include "event.h"
static inline void focus(struct swc_input_focus * input_focus,
struct swc_surface * surface,
diff --git a/libswc/keyboard.h b/libswc/keyboard.h
@@ -24,8 +24,8 @@
#ifndef SWC_KEYBOARD_H
#define SWC_KEYBOARD_H
-#include "surface.h"
#include "input_focus.h"
+#include "surface.h"
#include "xkb.h"
#include <wayland-util.h>
diff --git a/libswc/mode.c b/libswc/mode.c
@@ -1,7 +1,7 @@
-#include <stdio.h>
-
#include "mode.h"
+#include <stdio.h>
+
bool swc_mode_initialize(struct swc_mode * mode, drmModeModeInfo * mode_info)
{
mode->width = mode_info->hdisplay;
diff --git a/libswc/output.c b/libswc/output.c
@@ -1,7 +1,7 @@
#include "output.h"
+#include "drm.h"
#include "mode.h"
#include "util.h"
-#include "drm.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/libswc/plane.c b/libswc/plane.c
@@ -22,9 +22,9 @@
*/
#include "plane.h"
-#include "output.h"
-#include "mode.h"
#include "drm.h"
+#include "mode.h"
+#include "output.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/libswc/pointer.c b/libswc/pointer.c
@@ -1,6 +1,6 @@
#include "pointer.h"
-#include "util.h"
#include "event.h"
+#include "util.h"
#include <stdio.h>
#include <assert.h>
diff --git a/libswc/pointer.h b/libswc/pointer.h
@@ -1,8 +1,8 @@
#ifndef SWC_POINTER_H
#define SWC_POINTER_H
-#include "surface.h"
#include "input_focus.h"
+#include "surface.h"
#include <wayland-server.h>
#include <pixman.h>
diff --git a/libswc/renderer.h b/libswc/renderer.h
@@ -1,9 +1,9 @@
#ifndef SWC_RENDERER_H
#define SWC_RENDERER_H
+#include "drm.h"
#include "output.h"
#include "surface.h"
-#include "drm.h"
struct swc_render_target
{
diff --git a/libswc/seat.c b/libswc/seat.c
@@ -1,8 +1,8 @@
#include "seat.h"
#include "evdev_device.h"
-#include "util.h"
#include "event.h"
#include "private.h"
+#include "util.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/libswc/shell.c b/libswc/shell.c
@@ -22,8 +22,8 @@
*/
#include "shell.h"
-#include "shell_surface.h"
#include "private.h"
+#include "shell_surface.h"
#include <wayland-server.h>
diff --git a/libswc/shell_surface.c b/libswc/shell_surface.c
@@ -22,10 +22,10 @@
*/
#include "swc.h"
-#include "window.h"
+#include "compositor_surface.h"
#include "internal.h"
#include "shell_surface.h"
-#include "compositor_surface.h"
+#include "window.h"
#include <stdlib.h>
diff --git a/libswc/surface.c b/libswc/surface.c
@@ -22,10 +22,10 @@
*/
#include "surface.h"
+#include "drm_buffer.h"
#include "event.h"
#include "region.h"
#include "util.h"
-#include "drm_buffer.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/libswc/window.c b/libswc/window.c
@@ -21,12 +21,12 @@
* SOFTWARE.
*/
-#include "swc.h"
#include "window.h"
#include "compositor.h"
#include "compositor_surface.h"
#include "internal.h"
#include "private.h"
+#include "swc.h"
#include <stdlib.h>
#include <string.h>