From b1fc27848421a62cbf6cefb06d28e85711a9892a Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Thu, 23 May 2002 18:26:23 +0000 Subject: ANSIfy variable-argument macros. --- sys/sys/eventhandler.h | 8 ++++---- sys/sys/iconv.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index 1bffef4e5b4a..f50abafa480e 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -75,7 +75,7 @@ struct __hack struct eventhandler_list Xeventhandler_list_ ## name = { #name }; \ struct __hack -#define EVENTHANDLER_FAST_INVOKE(name, args...) \ +#define EVENTHANDLER_FAST_INVOKE(name, ...) \ do { \ struct eventhandler_list *_el = &Xeventhandler_list_ ## name ; \ struct eventhandler_entry *_ep, *_en; \ @@ -87,7 +87,7 @@ do { \ while (_ep != NULL) { \ _en = TAILQ_NEXT(_ep, ee_link); \ _t = (struct eventhandler_entry_ ## name *)_ep; \ - _t->eh_func(_ep->ee_arg , ## args); \ + _t->eh_func(_ep->ee_arg , ## __VA_ARGS__); \ _ep = _en; \ } \ EHE_UNLOCK(_el); \ @@ -116,7 +116,7 @@ struct eventhandler_entry_ ## name \ }; \ struct __hack -#define EVENTHANDLER_INVOKE(name, args...) \ +#define EVENTHANDLER_INVOKE(name, ...) \ do { \ struct eventhandler_list *_el; \ struct eventhandler_entry *_ep, *_en; \ @@ -129,7 +129,7 @@ do { \ while (_ep != NULL) { \ _en = TAILQ_NEXT(_ep, ee_link); \ _t = (struct eventhandler_entry_ ## name *)_ep; \ - _t->eh_func(_ep->ee_arg , ## args); \ + _t->eh_func(_ep->ee_arg , ## __VA_ARGS__); \ _ep = _en; \ } \ EHE_UNLOCK(_el); \ 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 */ -- cgit v1.2.3