X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=macro.h;h=2eaa3d6fbbdadbf5075a99d825423a815ff08e6a;hp=f7ccf44f7685fe01889ab66cacab92bc330821a8;hb=11857f8daf5a6336865844dedff365f9fa22c8f4;hpb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6

diff --git a/macro.h b/macro.h
index f7ccf44f7..2eaa3d6fb 100644
--- a/macro.h
+++ b/macro.h
@@ -25,16 +25,16 @@
 #include <assert.h>
 #include <sys/types.h>
 
-#define __printf_attr(a,b) __attribute__ ((format (printf, a, b)))
-#define __sentinel __attribute__ ((sentinel))
-#define __noreturn __attribute__((noreturn))
-#define __unused __attribute__ ((unused))
-#define __destructor __attribute__ ((destructor))
-#define __pure __attribute__ ((pure))
-#define __const __attribute__ ((const))
-#define __deprecated __attribute__ ((deprecated))
-#define __packed __attribute__ ((packed))
-#define __malloc __attribute__ ((malloc))
+#define _printf_attr(a,b) __attribute__ ((format (printf, a, b)))
+#define _sentinel __attribute__ ((sentinel))
+#define _noreturn __attribute__((noreturn))
+#define _unused __attribute__ ((unused))
+#define _destructor __attribute__ ((destructor))
+#define _pure __attribute__ ((pure))
+#define _const __attribute__ ((const))
+#define _deprecated __attribute__ ((deprecated))
+#define _packed __attribute__ ((packed))
+#define _malloc __attribute__ ((malloc))
 
 /* Rounds up */
 static inline size_t ALIGN(size_t l) {
@@ -97,4 +97,10 @@ static inline size_t ALIGN(size_t l) {
 
 #define char_array_0(x) x[sizeof(x)-1] = 0;
 
+#define IOVEC_SET_STRING(iovec, s)              \
+        do {                                    \
+                (iovec).iov_base = s;           \
+                (iovec).iov_len = strlen(s);    \
+        } while(false);
+
 #endif