X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=7a2661a04fd0ca04c343cdc088eac98b0a26e33d;hb=0a1a17aa2d9112470124ef5afb9314343777dc29;hp=17ffd19f55415cfc0c4759021df1d442c14f3fe2;hpb=ab94af9201496ea3aa59bbf2a01eb750fbd1c08a;p=elogind.git

diff --git a/src/shared/util.h b/src/shared/util.h
index 17ffd19f5..7a2661a04 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -59,6 +59,17 @@ typedef struct dual_timestamp {
 #define USEC_PER_MONTH (2629800ULL*USEC_PER_SEC)
 #define USEC_PER_YEAR (31557600ULL*USEC_PER_SEC)
 
+/*
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr: the pointer to the member.
+ * @type: the type of the container struct this is embedded in.
+ * @member: the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) ({ \
+        const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+        (type *)( (char *)__mptr - offsetof(type,member) );})
+
 /* What is interpreted as whitespace? */
 #define WHITESPACE " \t\n\r"
 #define NEWLINE "\n\r"
@@ -450,6 +461,7 @@ int symlink_or_copy_atomic(const char *from, const char *to);
 int fchmod_umask(int fd, mode_t mode);
 
 int conf_files_list(char ***strv, const char *suffix, const char *dir, ...);
+int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs);
 
 int hwclock_is_localtime(void);
 int hwclock_apply_localtime_delta(int *min);