From 1161d31aea76e6de2f8dac3021fb355d92944920 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 18 Jan 2012 15:53:38 +0100
Subject: [PATCH] test: move container_of() macro into task.h

---
 test/benchmark-tcp-write-batch.c | 4 ----
 test/blackhole-server.c          | 4 ----
 test/task.h                      | 7 +++++--
 test/test-thread.c               | 4 ----
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/test/benchmark-tcp-write-batch.c b/test/benchmark-tcp-write-batch.c
index 77bb0191..0b15f44b 100644
--- a/test/benchmark-tcp-write-batch.c
+++ b/test/benchmark-tcp-write-batch.c
@@ -23,15 +23,11 @@
 #include "task.h"
 
 #include <stdio.h>
-#include <stddef.h>
 #include <stdlib.h>
 
 #define WRITE_REQ_DATA  "Hello, world."
 #define NUM_WRITE_REQS  (1000 * 1000)
 
-#define container_of(ptr, type, member) \
-  ((type *) ((char *) (ptr) - offsetof(type, member)))
-
 typedef struct {
   uv_write_t req;
   uv_buf_t buf;
diff --git a/test/blackhole-server.c b/test/blackhole-server.c
index 85a0efc2..765bb321 100644
--- a/test/blackhole-server.c
+++ b/test/blackhole-server.c
@@ -23,12 +23,8 @@
 #include "task.h"
 
 #include <stdio.h>
-#include <stddef.h>
 #include <stdlib.h>
 
-#define container_of(ptr, type, member) \
-  ((type *) ((char *) (ptr) - offsetof(type, member)))
-
 typedef struct {
   uv_tcp_t handle;
   uv_shutdown_t shutdown_req;
diff --git a/test/task.h b/test/task.h
index abc23182..a7938e60 100644
--- a/test/task.h
+++ b/test/task.h
@@ -22,9 +22,9 @@
 #ifndef TASK_H_
 #define TASK_H_
 
-
-#include <stdint.h>
 #include <stdio.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #define TEST_PORT 9123
@@ -40,6 +40,9 @@
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
+#define container_of(ptr, type, member) \
+  ((type *) ((char *) (ptr) - offsetof(type, member)))
+
 typedef enum {
   TCP = 0,
   UDP,
diff --git a/test/test-thread.c b/test/test-thread.c
index 2a0f7879..fb2e1d4e 100644
--- a/test/test-thread.c
+++ b/test/test-thread.c
@@ -23,12 +23,8 @@
 #include "task.h"
 
 #include <stdio.h>
-#include <stddef.h>
 #include <stdlib.h>
 
-#define container_of(ptr, type, member) \
-  ((type *) ((char *) (ptr) - offsetof(type, member)))
-
 struct getaddrinfo_req {
   uv_thread_t thread_id;
   unsigned int counter;