Add common utils helpers

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

5 files changed, 11 insertions, 7 deletions

diff --git a/src/armada_drm.h b/src/armada_drm.h
index a89d395..d231653 100644
--- a/src/armada_drm.h
+++ b/src/armada_drm.h
@@ -62,11 +62,6 @@ enum {
 #define GET_DRM_INFO(pScrn)		((struct armada_drm_info *)(pScrn)->driverPrivate)
 #define SET_DRM_INFO(pScrn, ptr)	((pScrn)->driverPrivate = (ptr))
 
-#define ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
-
-#define mint(x,y)	({(void)(&x == &y); x < y ? x : y; })
-#define maxt(x,y)	({(void)(&x == &y); x < y ? y : x; })
-
 /* DRM core support */
 Bool armada_drm_init_screen(ScrnInfoPtr pScrn);
 
diff --git a/src/armada_drm_xv.c b/src/armada_drm_xv.c
index e1b7afc..f864f3a 100644
--- a/src/armada_drm_xv.c
+++ b/src/armada_drm_xv.c
@@ -19,6 +19,7 @@
 #include "xf86Crtc.h"
 #include "xf86xv.h"
 #include "fourcc.h"
+#include "utils.h"
 #include <X11/extensions/Xv.h>
 #include <X11/Xatom.h>
 
diff --git a/src/utils.h b/src/utils.h
new file mode 100644
index 0000000..aa57269
--- /dev/null
+++ b/src/utils.h
@@ -0,0 +1,9 @@
+#ifndef UTILS_H
+#define UTILS_H
+
+#define ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
+
+#define mint(x,y)	({(void)(&x == &y); x < y ? x : y; })
+#define maxt(x,y)	({(void)(&x == &y); x < y ? y : x; })
+
+#endif
diff --git a/src/vivante_accel.c b/src/vivante_accel.c
index fe6f9b3..0fcce25 100644
--- a/src/vivante_accel.c
+++ b/src/vivante_accel.c
@@ -25,6 +25,7 @@
 #include "vivante_accel.h"
 #include "vivante_unaccel.h"
 #include "vivante_utils.h"
+#include "utils.h"
 
 #include <gc_hal_raster.h>
 #include <gc_hal_enum.h>
diff --git a/src/vivante_utils.h b/src/vivante_utils.h
index 2c34dc9..eac45e3 100644
--- a/src/vivante_utils.h
+++ b/src/vivante_utils.h
@@ -13,8 +13,6 @@
 struct vivante;
 struct vivante_pixmap;
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
 const char *vivante_strerror(int err);
 #define vivante_error(v,w,e) __vivante_error(v,__func__,w,e)
 void __vivante_error(struct vivante *, const char *, const char *, int);