From 99723e15babd1aeecffa72abdbdab6a615d49821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= Date: Fri, 18 Jun 2004 20:28:48 +0000 Subject: [PATCH] Also tries C99 __VA_ARGS__ before using functions. * include/glibtop/error.h: Also tries C99 __VA_ARGS__ before using functions. --- ChangeLog | 5 +++++ include/glibtop/error.h | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e41f97fc..13ae5426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-06-18 Benoît Dejean + + * include/glibtop/error.h: Also tries C99 __VA_ARGS__ before using + functions. + 2004-06-18 Benoît Dejean * include/glibtop/error.h: Moved 8 static error functions to diff --git a/include/glibtop/error.h b/include/glibtop/error.h index dd41360a..b4a57a36 100644 --- a/include/glibtop/error.h +++ b/include/glibtop/error.h @@ -48,7 +48,15 @@ void G_GNUC_UNUSED glibtop_warn_io_r (glibtop *server, char *format, ...); #define glibtop_error_io(p1, args...) glibtop_error_io_r(glibtop_global_server , p1 , ## args) #define glibtop_warn_io(p1, args...) glibtop_warn_io_r(glibtop_global_server , p1 , ## args) -#else /* no __GNUC__ */ +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +#define glibtop_error(p1, ...) glibtop_error_r(glibtop_global_server , p1 , __VA_ARGS__) +#define glibtop_warn(p1, ...) glibtop_warn_r(glibtop_global_server , p1 , __VA_ARGS__) + +#define glibtop_error_io(p1, ...) glibtop_error_io_r(glibtop_global_server , p1 , __VA_ARGS__) +#define glibtop_warn_io(p1, ...) glibtop_warn_io_r(glibtop_global_server , p1 , __VA_ARGS__) + +#else /* no __GNUC__, no C99*/ void glibtop_error (char *format, ...); void glibtop_warn (char *format, ...);