X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Ffunctions.h;h=35f8b6c832116ff308f6f371fe2c851542a2ff3f;hb=7d4064fb2ca678359a6fa29a30a00c08fa75e70a;hp=37bca23e321efc0d99d19658d7d7cb126f65227f;hpb=276f020fb7d0ce2740e90a749b3a49d0d5f74d3d;p=exim.git

diff --git a/src/src/functions.h b/src/src/functions.h
index 37bca23e3..35f8b6c83 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -198,7 +198,7 @@ extern BOOL    dkim_transport_write_message(transport_ctx *,
 extern dns_address *dns_address_from_rr(dns_answer *, dns_record *);
 extern int     dns_basic_lookup(dns_answer *, const uschar *, int);
 extern void    dns_build_reverse(const uschar *, uschar *);
-extern time_t  dns_expire_from_soa(dns_answer *);
+extern time_t  dns_expire_from_soa(dns_answer *, int);
 extern void    dns_init(BOOL, BOOL, BOOL);
 extern BOOL    dns_is_aa(const dns_answer *);
 extern BOOL    dns_is_secure(const dns_answer *);
@@ -520,8 +520,7 @@ extern uschar *string_localpart_utf8_to_alabel(const uschar *, uschar **);
 #endif
 
 #define string_format(buf, siz, fmt, ...) \
-	string_format_trc(buf, siz, US __FUNCTION__, __LINE__, \
-				fmt __VA_OPT__(,) __VA_ARGS__)
+	string_format_trc(buf, siz, US __FUNCTION__, __LINE__, fmt, __VA_ARGS__)
 extern BOOL    string_format_trc(uschar *, int, const uschar *, unsigned,
 			const char *, ...) ALMOST_PRINTF(5,6);
 
@@ -532,8 +531,7 @@ extern gstring *string_vformat_trc(gstring *, const uschar *, unsigned,
 			unsigned, unsigned, const char *, va_list);
 
 #define string_open_failed(eno, fmt, ...) \
-	string_open_failed_trc(eno, US __FUNCTION__, __LINE__, \
-				fmt __VA_OPT__(,) __VA_ARGS__)
+	string_open_failed_trc(eno, US __FUNCTION__, __LINE__, fmt, __VA_ARGS__)
 extern uschar *string_open_failed_trc(int, const uschar *, unsigned,
 			const char *, ...) PRINTF_FUNCTION(4,5);
 
@@ -833,11 +831,11 @@ if (g) store_release_above_3(g->s + (g->size = g->ptr + 1), file, line);
 
 #define string_fmt_append(g, fmt, ...) \
 	string_fmt_append_f_trc(g, US __FUNCTION__, __LINE__, \
-	SVFMT_EXTEND|SVFMT_REBUFFER, fmt __VA_OPT__(,) __VA_ARGS__)
+	SVFMT_EXTEND|SVFMT_REBUFFER, fmt, __VA_ARGS__)
 
 #define string_fmt_append_f(g, flgs, fmt, ...) \
 	string_fmt_append_f_trc(g, US __FUNCTION__, __LINE__, \
-				flgs, fmt __VA_OPT__(,) __VA_ARGS__)
+	flgs,         fmt, __VA_ARGS__)
 
 static inline gstring *
 string_fmt_append_f_trc(gstring * g, const uschar * func, unsigned line,