From: Zachary T Welch <zw@superlucidity.net>
Date: Mon, 16 Nov 2009 10:29:09 +0000 (-0800)
Subject: move container_of to types.h
X-Git-Tag: v0.4.0-rc1~570
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f0ce88b3af9a6090ac986160950d66317de5087e;p=openocd

move container_of to types.h

The container_of macro is useful as a general solution.  It belongs
in types.h, rather than target.h where it was introduced.  Requires
the offsetof macro, which comes from <stddef.h> (moved as well).
---

diff --git a/src/helper/types.h b/src/helper/types.h
index 79eac13a..a8753c5f 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -23,6 +23,7 @@
 #ifndef TYPES_H
 #define TYPES_H
 
+#include <stddef.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -58,6 +59,20 @@ typedef bool _Bool;
 #define stringify(s) __stringify(s)
 #define __stringify(s) #s
 
+
+/**
+ * Cast a member of a structure out to the containing structure.
+ * @param ptr The pointer to the member.
+ * @param type The type of the container struct this is embedded in.
+ * @param member The name of the member within the struct.
+ *
+ * This is a mechanism which is used throughout the Linux kernel.
+ */
+#define container_of(ptr, type, member) ({			\
+	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
+
 /* DANGER!!!! here be dragons!
  *
  * Leave these fn's as byte accesses because it is safe
diff --git a/src/target/target.h b/src/target/target.h
index 51fb299c..ee40209c 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -26,7 +26,6 @@
 #ifndef TARGET_H
 #define TARGET_H
 
-#include <stddef.h>
 #include "types.h"
 #include "jim.h"
 
@@ -39,18 +38,6 @@ struct mem_param;
 struct reg_param;
 
 
-/**
- * Cast a member of a structure out to the containing structure.
- * @param ptr The pointer to the member.
- * @param type The type of the container struct this is embedded in.
- * @param member The name of the member within the struct.
- *
- * This is a mechanism which is used throughout the Linux kernel.
- */
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
-
 /*
  * TARGET_UNKNOWN = 0: we don't know anything about the target yet
  * TARGET_RUNNING = 1: the target is executing user code