summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2002-07-15 13:34:50 +0000
committermarkm <markm@FreeBSD.org>2002-07-15 13:34:50 +0000
commit604c6c5ec9b045ddad55b64b7f33f24e8fc41832 (patch)
tree2ea2aaf773b0afb6549d164d9f1d1bce83d69824
parent5ac51e5b212ce73bdf5791ec07b3dd35d03b1eac (diff)
downloadFreeBSD-src-604c6c5ec9b045ddad55b64b7f33f24e8fc41832.zip
FreeBSD-src-604c6c5ec9b045ddad55b64b7f33f24e8fc41832.tar.gz
Convert GNU variadic macros to the ISO 9X variety.
-rw-r--r--sys/libkern/iconv.c4
-rw-r--r--sys/sys/iconv.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index 8eafa28..1cd7147 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 0f20129..affcc52 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 */
OpenPOWER on IntegriCloud