diff --git a/clients/calibrator.c b/clients/calibrator.c index f890bc80f..be65d9bdc 100644 --- a/clients/calibrator.c +++ b/clients/calibrator.c @@ -38,7 +38,7 @@ #include #include "window.h" -#include +#include "shared/helpers.h" #include /* Our points for the calibration must be not be on a line */ diff --git a/clients/clickdot.c b/clients/clickdot.c index d8ed0ef4e..4a946df8b 100644 --- a/clients/clickdot.c +++ b/clients/clickdot.c @@ -40,7 +40,7 @@ #include #include "window.h" -#include +#include "shared/helpers.h" #include "shared/xalloc.h" struct clickdot { diff --git a/clients/cliptest.c b/clients/cliptest.c index c37530fe1..bdff3db07 100644 --- a/clients/cliptest.c +++ b/clients/cliptest.c @@ -56,7 +56,7 @@ #include "libweston/matrix.h" #include "libweston/vertex-clipping.h" -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "window.h" diff --git a/clients/color.c b/clients/color.c index bd46134e7..edb815c7c 100644 --- a/clients/color.c +++ b/clients/color.c @@ -27,7 +27,7 @@ #include #include "color-management-v1-client-protocol.h" -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "single-pixel-buffer-v1-client-protocol.h" #include "viewporter-client-protocol.h" diff --git a/clients/constraints.c b/clients/constraints.c index 3b2195ead..e53389f4c 100644 --- a/clients/constraints.c +++ b/clients/constraints.c @@ -30,7 +30,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "shared/os-compatibility.h" #include "shared/cairo-util.h" diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c index 7cdde1eba..c767fa359 100644 --- a/clients/desktop-shell.c +++ b/clients/desktop-shell.c @@ -44,7 +44,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "shared/cairo-util.h" #include "shared/file-util.h" diff --git a/clients/dnd.c b/clients/dnd.c index 206d7fb00..f36100d1c 100644 --- a/clients/dnd.c +++ b/clients/dnd.c @@ -42,7 +42,7 @@ #include "window.h" #include "shared/cairo-util.h" -#include +#include "shared/helpers.h" #include "shared/xalloc.h" struct dnd_drag; diff --git a/clients/editor.c b/clients/editor.c index b349f8102..ed67fd16c 100644 --- a/clients/editor.c +++ b/clients/editor.c @@ -39,7 +39,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "window.h" #include "text-input-unstable-v1-client-protocol.h" diff --git a/clients/eventdemo.c b/clients/eventdemo.c index 910f7f13a..822cb98df 100644 --- a/clients/eventdemo.c +++ b/clients/eventdemo.c @@ -42,7 +42,7 @@ #include -#include +#include "shared/helpers.h" #include "window.h" /** window title */ diff --git a/clients/image.c b/clients/image.c index 5cb39b107..b48d7f4b5 100644 --- a/clients/image.c +++ b/clients/image.c @@ -43,7 +43,7 @@ #include "window.h" #include "shared/cairo-util.h" -#include +#include "shared/helpers.h" #include "shared/image-loader.h" bool verbose; diff --git a/clients/ivi-shell-user-interface.c b/clients/ivi-shell-user-interface.c index dd7699200..2bf164ea5 100644 --- a/clients/ivi-shell-user-interface.c +++ b/clients/ivi-shell-user-interface.c @@ -40,7 +40,7 @@ #include #include "shared/cairo-util.h" #include -#include +#include "shared/helpers.h" #include "shared/os-compatibility.h" #include "shared/xalloc.h" #include diff --git a/clients/presentation-shm.c b/clients/presentation-shm.c index 2945b5cff..2bb0aa1ce 100644 --- a/clients/presentation-shm.c +++ b/clients/presentation-shm.c @@ -38,7 +38,7 @@ #include #include -#include +#include "shared/helpers.h" #include #include "shared/timespec-util.h" #include "shared/os-compatibility.h" diff --git a/clients/simple-dmabuf-egl.c b/clients/simple-dmabuf-egl.c index e374925bf..9989497e7 100644 --- a/clients/simple-dmabuf-egl.c +++ b/clients/simple-dmabuf-egl.c @@ -43,7 +43,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/platform.h" #include "shared/weston-drm-fourcc.h" #include diff --git a/clients/simple-dmabuf-feedback.c b/clients/simple-dmabuf-feedback.c index 133d17252..0ba5ae430 100644 --- a/clients/simple-dmabuf-feedback.c +++ b/clients/simple-dmabuf-feedback.c @@ -34,7 +34,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/platform.h" #include "shared/weston-drm-fourcc.h" #include diff --git a/clients/simple-dmabuf-v4l.c b/clients/simple-dmabuf-v4l.c index d19090f37..8ed3a0b53 100644 --- a/clients/simple-dmabuf-v4l.c +++ b/clients/simple-dmabuf-v4l.c @@ -46,14 +46,13 @@ #include #include - #include -#include - #include "xdg-shell-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h" #include "weston-direct-display-client-protocol.h" #include "viewporter-client-protocol.h" + +#include "shared/helpers.h" #include "shared/weston-drm-fourcc.h" #define CLEAR(x) memset(&(x), 0, sizeof(x)) diff --git a/clients/simple-egl.c b/clients/simple-egl.c index ce74da13a..fadeac34c 100644 --- a/clients/simple-egl.c +++ b/clients/simple-egl.c @@ -51,7 +51,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/platform.h" #include "shared/weston-egl-ext.h" #include "shared/xalloc.h" diff --git a/clients/simple-im.c b/clients/simple-im.c index 33309e52c..ef9a604c7 100644 --- a/clients/simple-im.c +++ b/clients/simple-im.c @@ -36,7 +36,7 @@ #include "window.h" #include "input-method-unstable-v1-client-protocol.h" -#include +#include "shared/helpers.h" enum compose_state { state_normal, diff --git a/clients/simple-touch.c b/clients/simple-touch.c index de5ef7f27..e32013161 100644 --- a/clients/simple-touch.c +++ b/clients/simple-touch.c @@ -36,7 +36,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "shared/os-compatibility.h" diff --git a/clients/stacking.c b/clients/stacking.c index d4dda3b07..680255960 100644 --- a/clients/stacking.c +++ b/clients/stacking.c @@ -36,7 +36,7 @@ #include #include "shared/xalloc.h" -#include +#include "shared/helpers.h" #include "window.h" struct stacking_window { diff --git a/clients/subsurfaces.c b/clients/subsurfaces.c index 039440585..530ee196d 100644 --- a/clients/subsurfaces.c +++ b/clients/subsurfaces.c @@ -42,7 +42,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include #include "window.h" diff --git a/clients/terminal.c b/clients/terminal.c index 50b1bde84..871391acf 100644 --- a/clients/terminal.c +++ b/clients/terminal.c @@ -46,7 +46,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "window.h" diff --git a/clients/touch-calibrator.c b/clients/touch-calibrator.c index 96c2ec286..49dd9206b 100644 --- a/clients/touch-calibrator.c +++ b/clients/touch-calibrator.c @@ -39,7 +39,7 @@ #include #include "clients/window.h" -#include +#include "shared/helpers.h" #include #include "weston-touch-calibration-client-protocol.h" diff --git a/clients/weston-debug.c b/clients/weston-debug.c index 08d1cb5a6..187fc8749 100644 --- a/clients/weston-debug.c +++ b/clients/weston-debug.c @@ -41,7 +41,7 @@ #include -#include +#include "shared/helpers.h" #include #include "weston-debug-client-protocol.h" diff --git a/clients/window.c b/clients/window.c index 9a5db875a..d3b7d6961 100644 --- a/clients/window.c +++ b/clients/window.c @@ -52,7 +52,7 @@ #include #include #include "shared/cairo-util.h" -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include #include "xdg-shell-client-protocol.h" diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c index 5d8902665..9b5d3b20a 100644 --- a/desktop-shell/input-panel.c +++ b/desktop-shell/input-panel.c @@ -30,10 +30,9 @@ #include #include -#include - #include "shell.h" #include "input-method-unstable-v1-server-protocol.h" +#include "shared/helpers.h" struct input_panel_surface { struct wl_resource *resource; diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 60636db23..81ee5e8f9 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -36,15 +36,14 @@ #include #include -#include -#include -#include -#include - #include "shell.h" #include "frontend/weston.h" #include "weston-desktop-shell-server-protocol.h" +#include +#include "shared/helpers.h" #include "shared/timespec-util.h" +#include +#include #define DEFAULT_NUM_WORKSPACES 1 #define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200 diff --git a/frontend/config-helpers.c b/frontend/config-helpers.c index c4ed2ee7c..21a0512eb 100644 --- a/frontend/config-helpers.c +++ b/frontend/config-helpers.c @@ -30,7 +30,7 @@ #include #include -#include +#include "shared/helpers.h" #include "weston-private.h" struct { diff --git a/frontend/main.c b/frontend/main.c index 042b6f3fc..c27c011d9 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -47,16 +47,15 @@ #include #include -#include -#include -#include - #include "weston.h" +#include #include "shared/os-compatibility.h" +#include "shared/helpers.h" #include "shared/process-util.h" #include "shared/string-helpers.h" #include "shared/xalloc.h" #include "git-version.h" +#include #include "weston.h" #include "weston-private.h" diff --git a/frontend/screen-share.c b/frontend/screen-share.c index 12702b1cb..305bab186 100644 --- a/frontend/screen-share.c +++ b/frontend/screen-share.c @@ -41,14 +41,14 @@ #include #include -#include -#include #include "backend.h" #include "libweston-internal.h" #include "pixel-formats.h" #include "weston.h" +#include "shared/helpers.h" #include "shared/os-compatibility.h" #include "shared/timespec-util.h" +#include #include "fullscreen-shell-unstable-v1-client-protocol.h" struct shared_output { diff --git a/frontend/systemd-notify.c b/frontend/systemd-notify.c index 0fd17fdc1..61196d818 100644 --- a/frontend/systemd-notify.c +++ b/frontend/systemd-notify.c @@ -30,11 +30,10 @@ #include #include -#include -#include -#include - +#include "shared/helpers.h" #include "shared/string-helpers.h" +#include +#include #include "weston.h" struct systemd_notifier { diff --git a/frontend/text-backend.c b/frontend/text-backend.c index 9399fcd8b..73a1eda30 100644 --- a/frontend/text-backend.c +++ b/frontend/text-backend.c @@ -34,11 +34,10 @@ #include #include -#include - #include "weston.h" #include "text-input-unstable-v1-server-protocol.h" #include "input-method-unstable-v1-server-protocol.h" +#include "shared/helpers.h" #include "shared/timespec-util.h" #include "shared/xalloc.h" diff --git a/frontend/weston-screenshooter.c b/frontend/weston-screenshooter.c index 1867a9c78..5499b3d0f 100644 --- a/frontend/weston-screenshooter.c +++ b/frontend/weston-screenshooter.c @@ -30,8 +30,8 @@ #include #include -#include #include "weston.h" +#include "shared/helpers.h" struct screenshooter { struct weston_compositor *ec; diff --git a/frontend/xwayland.c b/frontend/xwayland.c index 919d4d152..8d80a048b 100644 --- a/frontend/xwayland.c +++ b/frontend/xwayland.c @@ -35,7 +35,7 @@ #include #include "frontend/weston.h" #include -#include +#include "shared/helpers.h" #include "shared/os-compatibility.h" #include "shared/process-util.h" #include "shared/string-helpers.h" diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c index a3f8695dc..733e1a3e3 100644 --- a/fullscreen-shell/fullscreen-shell.c +++ b/fullscreen-shell/fullscreen-shell.c @@ -34,11 +34,10 @@ #include #include -#include -#include - #include "frontend/weston.h" #include "fullscreen-shell-unstable-v1-server-protocol.h" +#include "shared/helpers.h" +#include struct fullscreen_shell { struct wl_client *client; diff --git a/include/libweston/meson.build b/include/libweston/meson.build index f87ed4a49..fc1070c5f 100644 --- a/include/libweston/meson.build +++ b/include/libweston/meson.build @@ -10,7 +10,6 @@ install_headers( 'remoting-plugin.h', 'pipewire-plugin.h', 'shell-utils.h', - 'helpers.h', subdir: dir_include_libweston_install ) diff --git a/include/libweston/windowed-output-api.h b/include/libweston/windowed-output-api.h index 21a745ede..950bcefae 100644 --- a/include/libweston/windowed-output-api.h +++ b/include/libweston/windowed-output-api.h @@ -31,7 +31,6 @@ extern "C" { #endif #include -#include struct weston_compositor; struct weston_output; diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c index 943eec6cb..4e774f216 100644 --- a/ivi-shell/hmi-controller.c +++ b/ivi-shell/hmi-controller.c @@ -63,7 +63,7 @@ #include "ivi-layout-export.h" #include "ivi-hmi-controller-server-protocol.h" -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "frontend/weston.h" diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 304016f49..54a8842c4 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -68,7 +68,7 @@ #include "ivi-layout-private.h" #include "ivi-layout-shell.h" -#include +#include "shared/helpers.h" #include "shared/os-compatibility.h" #include "shared/xalloc.h" diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c index da0a0e1f7..17ed7cf89 100644 --- a/ivi-shell/ivi-shell.c +++ b/ivi-shell/ivi-shell.c @@ -42,14 +42,13 @@ #include #include -#include -#include - #include "input-method-unstable-v1-server-protocol.h" #include "ivi-shell.h" #include "ivi-application-server-protocol.h" #include "ivi-layout-private.h" #include "ivi-layout-shell.h" +#include "libweston/libweston.h" +#include "shared/helpers.h" #include "shared/xalloc.h" #include "frontend/weston.h" diff --git a/kiosk-shell/kiosk-shell-grab.c b/kiosk-shell/kiosk-shell-grab.c index afb7bb472..bff706fb3 100644 --- a/kiosk-shell/kiosk-shell-grab.c +++ b/kiosk-shell/kiosk-shell-grab.c @@ -24,7 +24,7 @@ */ #include "kiosk-shell-grab.h" -#include +#include "shared/helpers.h" struct kiosk_shell_grab { struct kiosk_shell_surface *shsurf; diff --git a/kiosk-shell/kiosk-shell.c b/kiosk-shell/kiosk-shell.c index a4887bf06..099478d9a 100644 --- a/kiosk-shell/kiosk-shell.c +++ b/kiosk-shell/kiosk-shell.c @@ -29,14 +29,14 @@ #include #include -#include -#include -#include - #include "kiosk-shell.h" #include "kiosk-shell-grab.h" #include "frontend/weston.h" #include "libweston/libweston.h" +#include "shared/helpers.h" +#include + +#include static struct kiosk_shell_surface * get_kiosk_shell_surface(struct weston_surface *surface) diff --git a/libweston/animation.c b/libweston/animation.c index 47be2d4ac..3d8cc7a20 100644 --- a/libweston/animation.c +++ b/libweston/animation.c @@ -37,7 +37,7 @@ #include #include "libweston-internal.h" -#include +#include "shared/helpers.h" #include "shared/timespec-util.h" WL_EXPORT void diff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h index 4873529cc..a1c725811 100644 --- a/libweston/backend-drm/drm-internal.h +++ b/libweston/backend-drm/drm-internal.h @@ -54,8 +54,8 @@ #include #include #include -#include #include "output-capture.h" +#include "shared/helpers.h" #include "shared/weston-drm-fourcc.h" #include "libinput-seat.h" #include "backend.h" diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c index 754922f55..8a872327f 100644 --- a/libweston/backend-drm/drm.c +++ b/libweston/backend-drm/drm.c @@ -51,9 +51,9 @@ #include #include #include -#include #include "drm-internal.h" #include "shared/hash.h" +#include "shared/helpers.h" #include "shared/timespec-util.h" #include "shared/string-helpers.h" #include "shared/weston-drm-fourcc.h" diff --git a/libweston/backend-drm/fb.c b/libweston/backend-drm/fb.c index c2ecd62c5..5716d8acd 100644 --- a/libweston/backend-drm/fb.c +++ b/libweston/backend-drm/fb.c @@ -38,8 +38,8 @@ #include #include #include -#include #include "shared/hash.h" +#include "shared/helpers.h" #include "shared/weston-drm-fourcc.h" #include "drm-internal.h" #include "linux-dmabuf.h" diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c index 6037bdafd..e8f98791c 100644 --- a/libweston/backend-drm/kms.c +++ b/libweston/backend-drm/kms.c @@ -36,7 +36,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/weston-drm-fourcc.h" #include "drm-internal.h" #include "pixel-formats.h" diff --git a/libweston/backend-headless/headless.c b/libweston/backend-headless/headless.c index b73bbffad..9fe660417 100644 --- a/libweston/backend-headless/headless.c +++ b/libweston/backend-headless/headless.c @@ -37,7 +37,7 @@ #include #include -#include +#include "shared/helpers.h" #include "linux-explicit-synchronization.h" #include "pixel-formats.h" #include "pixman-renderer.h" diff --git a/libweston/backend-pipewire/pipewire.c b/libweston/backend-pipewire/pipewire.c index ad887f3a0..56bf591ef 100644 --- a/libweston/backend-pipewire/pipewire.c +++ b/libweston/backend-pipewire/pipewire.c @@ -49,14 +49,13 @@ #include #include +#include "shared/helpers.h" +#include "shared/timespec-util.h" +#include "shared/xalloc.h" #include #include #include #include -#include - -#include "shared/timespec-util.h" -#include "shared/xalloc.h" #include "pixel-formats.h" #include "pixman-renderer.h" #include "renderer-gl/gl-renderer.h" diff --git a/libweston/backend-rdp/rdp.h b/libweston/backend-rdp/rdp.h index 1350b9b31..541579fe5 100644 --- a/libweston/backend-rdp/rdp.h +++ b/libweston/backend-rdp/rdp.h @@ -51,12 +51,12 @@ #include #include #include -#include #include #include "backend.h" +#include "shared/helpers.h" #include "shared/string-helpers.h" #define MAX_FREERDP_FDS 32 diff --git a/libweston/backend-vnc/vnc.c b/libweston/backend-vnc/vnc.c index 475ad1b0e..6cea3988e 100644 --- a/libweston/backend-vnc/vnc.c +++ b/libweston/backend-vnc/vnc.c @@ -47,13 +47,12 @@ #include #include +#include "shared/helpers.h" +#include "shared/xalloc.h" +#include "shared/timespec-util.h" #include #include #include -#include - -#include "shared/xalloc.h" -#include "shared/timespec-util.h" #include "pixel-formats.h" #include "pixman-renderer.h" #include "renderer-gl/gl-renderer.h" diff --git a/libweston/backend-wayland/wayland.c b/libweston/backend-wayland/wayland.c index b36cdefe6..8b5d96197 100644 --- a/libweston/backend-wayland/wayland.c +++ b/libweston/backend-wayland/wayland.c @@ -52,7 +52,7 @@ #include "shared/weston-drm-fourcc.h" #include "shared/weston-egl-ext.h" #include "pixman-renderer.h" -#include +#include "shared/helpers.h" #include "shared/image-loader.h" #include "shared/os-compatibility.h" #include "shared/cairo-util.h" diff --git a/libweston/backend-x11/x11.c b/libweston/backend-x11/x11.c index 4dd73b579..8c87d9ede 100644 --- a/libweston/backend-x11/x11.c +++ b/libweston/backend-x11/x11.c @@ -52,7 +52,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/image-loader.h" #include "shared/timespec-util.h" #include "shared/file-util.h" diff --git a/libweston/bindings.c b/libweston/bindings.c index c79ffeaef..4d2ad94f6 100644 --- a/libweston/bindings.c +++ b/libweston/bindings.c @@ -31,7 +31,7 @@ #include #include "libweston-internal.h" -#include +#include "shared/helpers.h" #include "shared/timespec-util.h" #include "tablet-unstable-v2-server-protocol.h" diff --git a/libweston/clipboard.c b/libweston/clipboard.c index 14a7aa823..a82d8fe85 100644 --- a/libweston/clipboard.c +++ b/libweston/clipboard.c @@ -34,9 +34,8 @@ #include #include -#include - #include "libweston-internal.h" +#include "shared/helpers.h" struct clipboard_source { struct weston_data_source base; diff --git a/libweston/color-lcms/color-lcms.c b/libweston/color-lcms/color-lcms.c index fbfe9e3b0..e8a473ab0 100644 --- a/libweston/color-lcms/color-lcms.c +++ b/libweston/color-lcms/color-lcms.c @@ -29,11 +29,11 @@ #include #include #include -#include #include "color.h" #include "color-lcms.h" #include "color-properties.h" +#include "shared/helpers.h" #include "shared/xalloc.h" #include "shared/weston-assert.h" diff --git a/libweston/color-lcms/color-lcms.h b/libweston/color-lcms/color-lcms.h index 79a83520d..e519565e5 100644 --- a/libweston/color-lcms/color-lcms.h +++ b/libweston/color-lcms/color-lcms.h @@ -30,9 +30,9 @@ #include #include #include -#include #include "color.h" +#include "shared/helpers.h" #include "shared/os-compatibility.h" /* diff --git a/libweston/color-lcms/color-profile.c b/libweston/color-lcms/color-profile.c index 08f0f4a04..5fea80e02 100644 --- a/libweston/color-lcms/color-profile.c +++ b/libweston/color-lcms/color-profile.c @@ -29,11 +29,11 @@ #include #include #include -#include #include "color.h" #include "color-lcms.h" #include "color-management.h" +#include "shared/helpers.h" #include "shared/string-helpers.h" #include "shared/xalloc.h" #include "shared/weston-assert.h" diff --git a/libweston/color-lcms/color-transform.c b/libweston/color-lcms/color-transform.c index 02f13e388..d4a02c471 100644 --- a/libweston/color-lcms/color-transform.c +++ b/libweston/color-lcms/color-transform.c @@ -34,7 +34,7 @@ #include "color-curve-segments.h" #include "color-lcms.h" #include "color-properties.h" -#include +#include "shared/helpers.h" #include "shared/string-helpers.h" #include "shared/weston-assert.h" #include "shared/xalloc.h" diff --git a/libweston/color-management.c b/libweston/color-management.c index ed988944b..1a84de82c 100644 --- a/libweston/color-management.c +++ b/libweston/color-management.c @@ -25,13 +25,12 @@ #include "config.h" -#include - #include "color.h" #include "color-management.h" #include "shared/string-helpers.h" #include "shared/weston-assert.h" #include "shared/xalloc.h" +#include "shared/helpers.h" #include diff --git a/libweston/color-noop.c b/libweston/color-noop.c index 3bd9fb1b4..2fdfbdacc 100644 --- a/libweston/color-noop.c +++ b/libweston/color-noop.c @@ -26,9 +26,9 @@ #include "config.h" #include -#include #include "color.h" +#include "shared/helpers.h" #include "shared/xalloc.h" #include "shared/weston-assert.h" diff --git a/libweston/color-profile-param-builder.c b/libweston/color-profile-param-builder.c index 6bd03bc2e..b1d7f5f34 100644 --- a/libweston/color-profile-param-builder.c +++ b/libweston/color-profile-param-builder.c @@ -25,10 +25,9 @@ #include "config.h" -#include - #include "color.h" #include "color-properties.h" +#include "shared/helpers.h" #include "shared/string-helpers.h" #include "shared/xalloc.h" #include "shared/weston-assert.h" diff --git a/libweston/color-properties.c b/libweston/color-properties.c index 74c488c63..7b53a948a 100644 --- a/libweston/color-properties.c +++ b/libweston/color-properties.c @@ -35,7 +35,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/weston-assert.h" #include "color-management-v1-server-protocol.h" diff --git a/libweston/color.c b/libweston/color.c index b5f6405c8..f139404f0 100644 --- a/libweston/color.c +++ b/libweston/color.c @@ -40,8 +40,8 @@ #include "id-number-allocator.h" #include "libweston-internal.h" #include -#include #include "shared/string-helpers.h" +#include "shared/helpers.h" #include "shared/xalloc.h" /** diff --git a/libweston/compositor.c b/libweston/compositor.c index 074f439e7..95f8d4dfd 100644 --- a/libweston/compositor.c +++ b/libweston/compositor.c @@ -58,7 +58,6 @@ #include #include -#include #include "linux-dmabuf.h" #include "linux-dmabuf-unstable-v1-server-protocol.h" #include "viewporter-server-protocol.h" @@ -68,6 +67,7 @@ #include "linux-explicit-synchronization.h" #include "single-pixel-buffer-v1-server-protocol.h" #include "shared/fd-util.h" +#include "shared/helpers.h" #include "shared/os-compatibility.h" #include "shared/string-helpers.h" #include "shared/timespec-util.h" diff --git a/libweston/content-protection.c b/libweston/content-protection.c index d3c482b13..d732b1657 100644 --- a/libweston/content-protection.c +++ b/libweston/content-protection.c @@ -34,7 +34,7 @@ #include #include "libweston-internal.h" #include "weston-content-protection-server-protocol.h" -#include +#include "shared/helpers.h" #include "shared/timespec-util.h" #define content_protection_log(cp, ...) \ diff --git a/libweston/data-device.c b/libweston/data-device.c index 56e36de1b..f259292cd 100644 --- a/libweston/data-device.c +++ b/libweston/data-device.c @@ -34,7 +34,7 @@ #include #include "libweston-internal.h" -#include +#include "shared/helpers.h" #include "shared/timespec-util.h" struct weston_drag { diff --git a/libweston/desktop/libweston-desktop.c b/libweston/desktop/libweston-desktop.c index 961ff9100..c1d82e630 100644 --- a/libweston/desktop/libweston-desktop.c +++ b/libweston/desktop/libweston-desktop.c @@ -30,7 +30,7 @@ #include #include -#include +#include "shared/helpers.h" #include #include "internal.h" diff --git a/libweston/desktop/xdg-shell.c b/libweston/desktop/xdg-shell.c index e7ba103e4..2ee58b9b3 100644 --- a/libweston/desktop/xdg-shell.c +++ b/libweston/desktop/xdg-shell.c @@ -37,7 +37,7 @@ #include #include "internal.h" -#include +#include "shared/helpers.h" /************************************************************************************ * WARNING: This file implements the stable xdg shell protocol. diff --git a/libweston/gl-borders.c b/libweston/gl-borders.c index 526ab716f..edf9df443 100644 --- a/libweston/gl-borders.c +++ b/libweston/gl-borders.c @@ -29,7 +29,7 @@ #include "config.h" #include "gl-borders.h" -#include +#include "shared/helpers.h" void weston_gl_borders_update(struct weston_gl_borders *borders, diff --git a/libweston/id-number-allocator.c b/libweston/id-number-allocator.c index ba3f5366b..aeae7e739 100644 --- a/libweston/id-number-allocator.c +++ b/libweston/id-number-allocator.c @@ -25,9 +25,8 @@ #include "config.h" -#include - #include "id-number-allocator.h" +#include "shared/helpers.h" #include "shared/xalloc.h" #include "shared/weston-assert.h" diff --git a/libweston/input.c b/libweston/input.c index 79df12fba..0aee74d28 100644 --- a/libweston/input.c +++ b/libweston/input.c @@ -40,7 +40,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/os-compatibility.h" #include "shared/timespec-util.h" #include diff --git a/libweston/libinput-device.c b/libweston/libinput-device.c index 01c234437..31b88ac43 100644 --- a/libweston/libinput-device.c +++ b/libweston/libinput-device.c @@ -39,10 +39,10 @@ #include #include -#include #include "backend.h" #include "libweston-internal.h" #include "libinput-device.h" +#include "shared/helpers.h" #include "shared/timespec-util.h" #include "tablet-unstable-v2-server-protocol.h" diff --git a/libweston/libinput-seat.c b/libweston/libinput-seat.c index e350c5121..5ecb97413 100644 --- a/libweston/libinput-seat.c +++ b/libweston/libinput-seat.c @@ -35,13 +35,13 @@ #include #include -#include #include "backend.h" #include "libweston-internal.h" #include "weston-log-internal.h" #include "launcher-util.h" #include "libinput-seat.h" #include "libinput-device.h" +#include "shared/helpers.h" static void process_events(struct udev_input *input); diff --git a/libweston/linux-dmabuf.c b/libweston/linux-dmabuf.c index 7074f6b15..d37121d76 100644 --- a/libweston/linux-dmabuf.c +++ b/libweston/linux-dmabuf.c @@ -36,7 +36,7 @@ #include "linux-dmabuf.h" #include "linux-dmabuf-unstable-v1-server-protocol.h" #include "shared/os-compatibility.h" -#include +#include "shared/helpers.h" #include "libweston-internal.h" #include "shared/weston-assert.h" #include "shared/weston-drm-fourcc.h" diff --git a/libweston/output-capture.c b/libweston/output-capture.c index d48eaa7dc..3265f063e 100644 --- a/libweston/output-capture.c +++ b/libweston/output-capture.c @@ -32,7 +32,7 @@ #include "libweston-internal.h" #include "output-capture.h" #include "pixel-formats.h" -#include +#include "shared/helpers.h" #include "shared/weston-drm-fourcc.h" #include "shared/xalloc.h" #include "weston-output-capture-server-protocol.h" diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c index fd3423217..46a93cc3c 100644 --- a/libweston/pixel-formats.c +++ b/libweston/pixel-formats.c @@ -37,7 +37,7 @@ #include -#include +#include "shared/helpers.h" #include "shared/string-helpers.h" #include "shared/weston-drm-fourcc.h" #include "shared/xalloc.h" diff --git a/libweston/pixman-renderer.c b/libweston/pixman-renderer.c index e109bd1e2..15401eb51 100644 --- a/libweston/pixman-renderer.c +++ b/libweston/pixman-renderer.c @@ -36,7 +36,7 @@ #include "color.h" #include "pixel-formats.h" #include "output-capture.h" -#include +#include "shared/helpers.h" #include "shared/weston-drm-fourcc.h" #include "shared/xalloc.h" diff --git a/libweston/renderer-gl/egl-glue.c b/libweston/renderer-gl/egl-glue.c index 7b2fa57a9..16d05078f 100644 --- a/libweston/renderer-gl/egl-glue.c +++ b/libweston/renderer-gl/egl-glue.c @@ -29,7 +29,7 @@ #include -#include +#include "shared/helpers.h" #include "shared/platform.h" #include "shared/string-helpers.h" diff --git a/libweston/renderer-gl/gl-renderer-internal.h b/libweston/renderer-gl/gl-renderer-internal.h index 0de5b053b..9edc12e9d 100644 --- a/libweston/renderer-gl/gl-renderer-internal.h +++ b/libweston/renderer-gl/gl-renderer-internal.h @@ -65,7 +65,7 @@ #include #include #include "shared/weston-egl-ext.h" /* for PFN* stuff */ -#include +#include "shared/helpers.h" /* Max number of images per buffer. */ #define SHADER_INPUT_TEX_MAX 3 diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c index 71e54b18f..970a34015 100644 --- a/libweston/renderer-gl/gl-renderer.c +++ b/libweston/renderer-gl/gl-renderer.c @@ -60,9 +60,8 @@ #include "output-capture.h" #include "pixel-formats.h" -#include - #include "shared/fd-util.h" +#include "shared/helpers.h" #include "shared/platform.h" #include "shared/string-helpers.h" #include "shared/timespec-util.h" diff --git a/libweston/renderer-gl/gl-shaders.c b/libweston/renderer-gl/gl-shaders.c index c956ceadd..007e107e7 100644 --- a/libweston/renderer-gl/gl-shaders.c +++ b/libweston/renderer-gl/gl-shaders.c @@ -36,7 +36,6 @@ #include #include -#include #include #include @@ -44,6 +43,7 @@ #include "gl-renderer.h" #include "gl-renderer-internal.h" #include "pixel-formats.h" +#include "shared/helpers.h" #include "shared/timespec-util.h" /* static const char vertex_shader[]; vertex.glsl */ diff --git a/libweston/screenshooter.c b/libweston/screenshooter.c index 47d475404..8b11e3484 100644 --- a/libweston/screenshooter.c +++ b/libweston/screenshooter.c @@ -36,7 +36,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/timespec-util.h" #include "backend.h" #include "libweston-internal.h" diff --git a/libweston/shell-utils/shell-utils.c b/libweston/shell-utils/shell-utils.c index 472a640e3..5587d44e9 100644 --- a/libweston/shell-utils/shell-utils.c +++ b/libweston/shell-utils/shell-utils.c @@ -27,7 +27,7 @@ #include "config.h" #include #include -#include +#include "shared/helpers.h" /** * \defgroup shell-utils Shell utils diff --git a/libweston/timeline.h b/libweston/timeline.h index b13b0c701..23c06bb22 100644 --- a/libweston/timeline.h +++ b/libweston/timeline.h @@ -31,9 +31,10 @@ #include #include -#include #include +#include "shared/helpers.h" + enum timeline_type { TLT_END = 0, TLT_OUTPUT, diff --git a/libweston/touch-calibration.c b/libweston/touch-calibration.c index a539625f3..f4c9366a0 100644 --- a/libweston/touch-calibration.c +++ b/libweston/touch-calibration.c @@ -29,7 +29,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/string-helpers.h" #include #include "shared/timespec-util.h" diff --git a/libweston/vertex-clipping.c b/libweston/vertex-clipping.c index e7065e2b1..319b35eee 100644 --- a/libweston/vertex-clipping.c +++ b/libweston/vertex-clipping.c @@ -27,7 +27,7 @@ #include #include -#include +#include "shared/helpers.h" #include "vertex-clipping.h" struct clip_context { diff --git a/libweston/weston-log-file.c b/libweston/weston-log-file.c index 59538455c..25e36b46a 100644 --- a/libweston/weston-log-file.c +++ b/libweston/weston-log-file.c @@ -26,7 +26,7 @@ #include "config.h" #include -#include +#include "shared/helpers.h" #include #include "weston-log-internal.h" diff --git a/libweston/weston-log-flight-rec.c b/libweston/weston-log-flight-rec.c index c979be07e..a577a38a8 100644 --- a/libweston/weston-log-flight-rec.c +++ b/libweston/weston-log-flight-rec.c @@ -26,7 +26,7 @@ #include "config.h" #include -#include +#include "shared/helpers.h" #include #include "weston-log-internal.h" diff --git a/libweston/weston-log-wayland.c b/libweston/weston-log-wayland.c index 14a8c5863..8b9771406 100644 --- a/libweston/weston-log-wayland.c +++ b/libweston/weston-log-wayland.c @@ -26,7 +26,7 @@ #include "config.h" #include -#include +#include "shared/helpers.h" #include #include "weston-log-internal.h" diff --git a/libweston/weston-log.c b/libweston/weston-log.c index e0269ee5f..5d6ff2bc9 100644 --- a/libweston/weston-log.c +++ b/libweston/weston-log.c @@ -27,7 +27,7 @@ #include "config.h" #include -#include +#include "shared/helpers.h" #include #include "weston-log-internal.h" diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c index f1dfb5418..86830c079 100644 --- a/remoting/remoting-plugin.c +++ b/remoting/remoting-plugin.c @@ -44,7 +44,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/timespec-util.h" #include "shared/weston-drm-fourcc.h" #include "shared/string-helpers.h" diff --git a/shared/cairo-util.c b/shared/cairo-util.c index 93cc09768..47a96e080 100644 --- a/shared/cairo-util.c +++ b/shared/cairo-util.c @@ -35,10 +35,10 @@ #include #include "cairo-util.h" -#include -#include +#include "shared/helpers.h" #include "image-loader.h" #include "shared/xalloc.h" +#include #ifdef HAVE_PANGO #include diff --git a/shared/config-parser.c b/shared/config-parser.c index 98b70709f..cd93e5f34 100644 --- a/shared/config-parser.c +++ b/shared/config-parser.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include "helpers.h" #include "string-helpers.h" /** diff --git a/include/libweston/helpers.h b/shared/helpers.h similarity index 99% rename from include/libweston/helpers.h rename to shared/helpers.h index 12a8fb50a..7ff60d03e 100644 --- a/include/libweston/helpers.h +++ b/shared/helpers.h @@ -19,8 +19,10 @@ * SOFTWARE. */ -#ifndef LIBWESTON_HELPERS_H -#define LIBWESTON_HELPERS_H +#ifndef WESTON_HELPERS_H +#define WESTON_HELPERS_H + +#include "config.h" #include diff --git a/shared/image-loader.c b/shared/image-loader.c index d95c97595..c5131dcc6 100644 --- a/shared/image-loader.c +++ b/shared/image-loader.c @@ -36,7 +36,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/os-compatibility.h" #include "shared/xalloc.h" #include "image-loader.h" diff --git a/shared/process-util.c b/shared/process-util.c index 954f318be..fe895d234 100644 --- a/shared/process-util.c +++ b/shared/process-util.c @@ -35,7 +35,7 @@ #include -#include +#include "helpers.h" #include "os-compatibility.h" #include "process-util.h" #include "string-helpers.h" diff --git a/shared/timespec-util.h b/shared/timespec-util.h index 37bb75fe8..f76b9537c 100644 --- a/shared/timespec-util.h +++ b/shared/timespec-util.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define NSEC_PER_SEC 1000000000 diff --git a/shared/xcb-xwayland.c b/shared/xcb-xwayland.c index 69b7740db..260dd5215 100644 --- a/shared/xcb-xwayland.c +++ b/shared/xcb-xwayland.c @@ -32,7 +32,7 @@ #include #include -#include +#include "shared/helpers.h" #include "xcb-xwayland.h" const char * diff --git a/tests/color_util.c b/tests/color_util.c index 31936770c..5db692e5a 100644 --- a/tests/color_util.c +++ b/tests/color_util.c @@ -33,9 +33,9 @@ #include #include -#include #include "color_util.h" #include "weston-test-runner.h" +#include "shared/helpers.h" static_assert(sizeof(struct color_float) == 4 * sizeof(float), "unexpected padding in struct color_float"); diff --git a/tests/config-parser-test.c b/tests/config-parser-test.c index f016bf211..33ad5d0b3 100644 --- a/tests/config-parser-test.c +++ b/tests/config-parser-test.c @@ -35,8 +35,8 @@ #include #include -#include +#include "shared/helpers.h" #include "zunitc/zunitc.h" struct fixture_data { diff --git a/tests/custom-env-test.c b/tests/custom-env-test.c index c1c3ca6bd..3a5161907 100644 --- a/tests/custom-env-test.c +++ b/tests/custom-env-test.c @@ -33,7 +33,7 @@ #include -#include +#include "shared/helpers.h" #include "shared/os-compatibility.h" #include "shared/process-util.h" #include "shared/string-helpers.h" diff --git a/tests/ivi-layout-internal-test.c b/tests/ivi-layout-internal-test.c index 2efdbb72f..3d75a6c5d 100644 --- a/tests/ivi-layout-internal-test.c +++ b/tests/ivi-layout-internal-test.c @@ -33,11 +33,10 @@ #include #include -#include - #include "ivi-shell/ivi-layout-export.h" #include "ivi-shell/ivi-layout-private.h" #include "ivi-test.h" +#include "shared/helpers.h" #include "weston-test-runner.h" #include "weston-test-fixture-compositor.h" diff --git a/tests/ivi-layout-test-client.c b/tests/ivi-layout-test-client.c index a7d54d5c8..b49701cc8 100644 --- a/tests/ivi-layout-test-client.c +++ b/tests/ivi-layout-test-client.c @@ -29,7 +29,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "weston-test-client-helper.h" #include "ivi-application-client-protocol.h" diff --git a/tests/ivi-layout-test-plugin.c b/tests/ivi-layout-test-plugin.c index 114292ad5..90f27630c 100644 --- a/tests/ivi-layout-test-plugin.c +++ b/tests/ivi-layout-test-plugin.c @@ -40,7 +40,7 @@ #include "weston-test-server-protocol.h" #include "ivi-test.h" #include "ivi-shell/ivi-layout-export.h" -#include +#include "shared/helpers.h" struct test_context; diff --git a/tests/lcms_util.c b/tests/lcms_util.c index b9d54d64f..eef32e619 100644 --- a/tests/lcms_util.c +++ b/tests/lcms_util.c @@ -33,7 +33,7 @@ #include #include -#include +#include "shared/helpers.h" #include "color_util.h" #include "lcms_util.h" diff --git a/tests/presentation-test.c b/tests/presentation-test.c index 6cd6c5b52..3ffedd1f4 100644 --- a/tests/presentation-test.c +++ b/tests/presentation-test.c @@ -32,7 +32,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "shared/timespec-util.h" #include "weston-test-client-helper.h" diff --git a/tests/timespec-test.c b/tests/timespec-test.c index b4c9e7691..fa1e6a163 100644 --- a/tests/timespec-test.c +++ b/tests/timespec-test.c @@ -36,7 +36,7 @@ #include "shared/timespec-util.h" -#include +#include "shared/helpers.h" #include "zunitc/zunitc.h" ZUC_TEST(timespec_test, timespec_sub) diff --git a/tests/viewporter-test.c b/tests/viewporter-test.c index 0d4aa2521..6f5ef669a 100644 --- a/tests/viewporter-test.c +++ b/tests/viewporter-test.c @@ -31,7 +31,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/xalloc.h" #include "weston-test-client-helper.h" #include "weston-test-fixture-compositor.h" diff --git a/tests/weston-test-desktop-shell.c b/tests/weston-test-desktop-shell.c index 72d626fe4..fe7f86f4e 100644 --- a/tests/weston-test-desktop-shell.c +++ b/tests/weston-test-desktop-shell.c @@ -38,7 +38,7 @@ #include "frontend/weston.h" #include -#include +#include "shared/helpers.h" #include #include diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c index 767aa2a17..45e6eac0b 100644 --- a/tests/weston-test-fixture-compositor.c +++ b/tests/weston-test-fixture-compositor.c @@ -37,7 +37,7 @@ #include #include -#include +#include "shared/helpers.h" #include "shared/string-helpers.h" #include "weston-test-fixture-compositor.h" #include "weston.h" diff --git a/tests/weston-test-runner.h b/tests/weston-test-runner.h index 87ab11745..a96348344 100644 --- a/tests/weston-test-runner.h +++ b/tests/weston-test-runner.h @@ -33,7 +33,7 @@ #include #include -#include +#include "shared/helpers.h" #include "weston-test-fixture-compositor.h" #include "weston-testsuite-data.h" diff --git a/tests/weston-test.c b/tests/weston-test.c index 6112335c0..420ec5a04 100644 --- a/tests/weston-test.c +++ b/tests/weston-test.c @@ -45,7 +45,7 @@ #include "weston.h" #include "weston-testsuite-data.h" -#include +#include "shared/helpers.h" #include "shared/timespec-util.h" #include "shared/xalloc.h" diff --git a/tests/xcb-client-helper.c b/tests/xcb-client-helper.c index 91ff647d0..c2249c2e2 100644 --- a/tests/xcb-client-helper.c +++ b/tests/xcb-client-helper.c @@ -36,14 +36,13 @@ #include -#include -#include - #include #include "test-config.h" #include "shared/os-compatibility.h" +#include "shared/helpers.h" #include "shared/xalloc.h" #include "shared/xcb-xwayland.h" +#include #include "xcb-client-helper.h" #define DEBUG diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c index 5b92c2e7a..9b460fa03 100644 --- a/tools/zunitc/src/zunitc_impl.c +++ b/tools/zunitc/src/zunitc_impl.c @@ -47,7 +47,7 @@ #include "zuc_junit_reporter.h" #include -#include +#include "shared/helpers.h" #include /* diff --git a/xwayland/launcher.c b/xwayland/launcher.c index 1dec2bd87..dd4ecdc8a 100644 --- a/xwayland/launcher.c +++ b/xwayland/launcher.c @@ -38,7 +38,7 @@ #include "xwayland.h" #include -#include +#include "shared/helpers.h" #include "shared/string-helpers.h" static void diff --git a/xwayland/selection.c b/xwayland/selection.c index f7d5888cb..c243aa2da 100644 --- a/xwayland/selection.c +++ b/xwayland/selection.c @@ -35,7 +35,7 @@ #include #include "xwayland.h" -#include +#include "shared/helpers.h" #ifdef WM_DEBUG #define wm_log(...) weston_log(__VA_ARGS__) diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c index 5ed2c9dee..d40367522 100644 --- a/xwayland/window-manager.c +++ b/xwayland/window-manager.c @@ -42,12 +42,12 @@ #include #include -#include #include "xwayland.h" #include "xwayland-internal-interface.h" #include "shared/cairo-util.h" #include "shared/hash.h" +#include "shared/helpers.h" #include "shared/xcb-xwayland.h" #include "xwayland-shell-v1-server-protocol.h"