Move un-namespaced container_of into private header

src/data-device.c

@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <stdio.h>
 
+#include "wayland-private.h"
 #include "wayland-server.h"
 
 static void

src/wayland-private.h

@@ -30,6 +30,10 @@
 
 #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) );})
+
 #define WL_ZOMBIE_OBJECT ((void *) 2)
 
 #define WL_MAP_SERVER_SIDE 0

src/wayland-shm.c

@@ -33,6 +33,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
+#include "wayland-private.h"
 #include "wayland-server.h"
 
 struct wl_shm_pool {

src/wayland-util.h

@@ -39,10 +39,6 @@ extern "C" {
 #define WL_EXPORT
 #endif
 
-#define container_of(ptr, type, member) ({				\
-	const __typeof__( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
-
 struct wl_message {
 	const char *name;
 	const char *signature;