[PATCH 2/2] s6dns-resolve.h: make it C++ compatible

From: Roman I Khimov <khimov_at_altell.ru>
Date: Thu, 11 Jun 2015 17:06:35 +0300

Can't use 'or' in macro, C++ compiler will complain:

/usr/include/s6-dns/s6dns-resolve.h:223:40: error: "or" may not appear in macro parameter list
 #define s6dns_resolven_loop_g(list, n, or, deadline) s6dns_resolven(list, n, or, (deadline), &STAMP)

---
 src/include/s6-dns/s6dns-resolve.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/include/s6-dns/s6dns-resolve.h b/src/include/s6-dns/s6dns-resolve.h
index e7eb629..805ea2a 100644
--- a/src/include/s6-dns/s6dns-resolve.h
+++ b/src/include/s6-dns/s6dns-resolve.h
_at_@ -220,7 +220,7 @@ extern int s6dns_resolve_mpag_r (stralloc *, genalloc *, char const *, unsigned
  */
 
 extern int s6dns_resolven_loop (s6dns_engine_t_ref, unsigned int, unsigned int, tain_t const *, tain_t *) ;
-#define s6dns_resolven_loop_g(list, n, or, deadline) s6dns_resolven(list, n, or, (deadline), &STAMP)
+#define s6dns_resolven_loop_g(list, n, zor, deadline) s6dns_resolven(list, n, zor, (deadline), &STAMP)
 
 typedef struct s6dns_resolve_s s6dns_resolve_t, *s6dns_resolve_t_ref ;
 struct s6dns_resolve_s
-- 
2.1.4

Received on Thu Jun 11 2015 - 14:06:35 UTC