From a8966f6598848ea7e11a77fc03ff94b33d72f838 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Mon, 15 Jul 2002 13:34:50 +0000
Subject: [PATCH] Convert GNU variadic macros to the ISO 9X variety.
---
sys/libkern/iconv.c | 4 +++-
sys/sys/iconv.h | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index 8eafa281d88e..1cd7147d6c0f 100644
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@@ -469,7 +469,9 @@ int
iconv_lookupcp(char **cpp, const char *s)
{
if (cpp == NULL) {
- ICDEBUG("warning a NULL list passed\n");
+ ICDEBUG("warning a NULL list passed\n", ""); /* XXX ISO variadic macros cannot
+ leave out the
+ variadic args */
return ENOENT;
}
for (; *cpp; cpp++)
diff --git a/sys/sys/iconv.h b/sys/sys/iconv.h
index 0f20129a80f4..affcc52e2eba 100644
--- a/sys/sys/iconv.h
+++ b/sys/sys/iconv.h
@@ -146,9 +146,9 @@ int iconv_converter_donestub(struct iconv_converter_class *dp);
int iconv_converter_handler(module_t mod, int type, void *data);
#ifdef ICONV_DEBUG
-#define ICDEBUG(format, args...) printf("%s: "format, __func__ ,## args)
+#define ICDEBUG(format, ...) printf("%s: "format, __func__ , __VA_ARGS__)
#else
-#define ICDEBUG(format, args...)
+#define ICDEBUG(format, ...)
#endif
#endif /* !_KERNEL */