From a65d570117dc73a3af5084319b645ab1556562e5 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 3 Feb 2010 14:25:37 +0100
Subject: [PATCH] macro: drop double __ prefix to make sure we don't collide
 with gcc/glibc definitions

---
 log.h   |  2 +-
 macro.h | 20 ++++++++++----------
 strv.h  |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/log.h b/log.h
index cd78a0a..232798a 100644
--- a/log.h
+++ b/log.h
@@ -31,7 +31,7 @@ void log_meta(
         const char*file,
         int line,
         const char *func,
-        const char *format, ...) __printf_attr(5,6);
+        const char *format, ...) _printf_attr(5,6);
 
 #define log_debug(...)   log_meta(LOG_DEBUG,   __FILE__, __LINE__, __func__, __VA_ARGS__)
 #define log_info(...)    log_meta(LOG_INFO,    __FILE__, __LINE__, __func__, __VA_ARGS__)
diff --git a/macro.h b/macro.h
index f7ccf44..76ae465 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) {
diff --git a/strv.h b/strv.h
index abe9192..7a132ef 100644
--- a/strv.h
+++ b/strv.h
@@ -33,7 +33,7 @@ char **strv_merge(char **a, char **b);
 
 bool strv_contains(char **l, const char *s);
 
-char **strv_new(const char *x, ...) __sentinel;
+char **strv_new(const char *x, ...) _sentinel;
 
 #define STRV_FOREACH(s, l)                      \
         for ((s) = (l); (s) && *(s); (s)++)
-- 
2.7.4