Moved helper macro to a discrete include file.
To help reduce code duplication and also 'kitchen-sink' includes
the ARRAY_LENGTH macro was moved to a stand-alone file and
referenced from the sources consuming it. Other macros will be
added in subsequent passes.
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 33e2af6..6d8684d 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -46,6 +46,7 @@
#include <gbm.h>
#include <libudev.h>
+#include "shared/helpers.h"
#include "libbacklight.h"
#include "compositor.h"
#include "gl-renderer.h"
diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
index 04fb718..a6fd823 100644
--- a/src/compositor-fbdev.c
+++ b/src/compositor-fbdev.c
@@ -42,6 +42,7 @@
#include <libudev.h>
+#include "shared/helpers.h"
#include "compositor.h"
#include "launcher-util.h"
#include "pixman-renderer.h"
diff --git a/src/compositor-headless.c b/src/compositor-headless.c
index 598eb33..c0e35ce 100644
--- a/src/compositor-headless.c
+++ b/src/compositor-headless.c
@@ -31,6 +31,7 @@
#include <sys/time.h>
#include <stdbool.h>
+#include "shared/helpers.h"
#include "compositor.h"
#include "pixman-renderer.h"
#include "presentation_timing-server-protocol.h"
diff --git a/src/compositor-rdp.c b/src/compositor-rdp.c
index d155507..6d4d1e4 100644
--- a/src/compositor-rdp.c
+++ b/src/compositor-rdp.c
@@ -65,6 +65,7 @@
#include <freerdp/locale/keyboard.h>
#include <winpr/input.h>
+#include "shared/helpers.h"
#include "compositor.h"
#include "pixman-renderer.h"
diff --git a/src/compositor-rpi.c b/src/compositor-rpi.c
index 722cf9c..8012461 100644
--- a/src/compositor-rpi.c
+++ b/src/compositor-rpi.c
@@ -46,6 +46,7 @@
# include "rpi-bcm-stubs.h"
#endif
+#include "shared/helpers.h"
#include "compositor.h"
#include "rpi-renderer.h"
#include "launcher-util.h"
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 4610552..ab73853 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -42,6 +42,7 @@
#include "compositor.h"
#include "gl-renderer.h"
#include "pixman-renderer.h"
+#include "shared/helpers.h"
#include "shared/image-loader.h"
#include "shared/os-compatibility.h"
#include "shared/cairo-util.h"
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index c5dcfb9..b85b134 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -53,6 +53,7 @@
#include "gl-renderer.h"
#include "pixman-renderer.h"
#include "shared/config-parser.h"
+#include "shared/helpers.h"
#include "shared/image-loader.h"
#include "presentation_timing-server-protocol.h"
diff --git a/src/compositor.c b/src/compositor.c
index 2f7864f..2f89b39 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -61,6 +61,7 @@
#include "compositor.h"
#include "scaler-server-protocol.h"
#include "presentation_timing-server-protocol.h"
+#include "shared/helpers.h"
#include "shared/os-compatibility.h"
#include "git-version.h"
#include "version.h"
diff --git a/src/compositor.h b/src/compositor.h
index 1e4ca27..685767e 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -49,8 +49,6 @@
#define MIN(x,y) (((x) < (y)) ? (x) : (y))
#endif
-#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
-
#define container_of(ptr, type, member) ({ \
const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );})
diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index ad7012a..62eb490 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -40,6 +40,7 @@
#include "gl-renderer.h"
#include "vertex-clipping.h"
+#include "shared/helpers.h"
#include "weston-egl-ext.h"
struct gl_shader {
diff --git a/src/input.c b/src/input.c
index 65d2d09..568985f 100644
--- a/src/input.c
+++ b/src/input.c
@@ -34,6 +34,7 @@
#include <fcntl.h>
#include <limits.h>
+#include "shared/helpers.h"
#include "shared/os-compatibility.h"
#include "compositor.h"