From b2ebed4324541ee73e431f9f9f9f8b9b99898236 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 29 Nov 2006 19:52:42 +0000 Subject: [PATCH] silc_va_copy to macro. --- lib/silcutil/silcutil.c | 15 --------------- lib/silcutil/silcutil.h | 10 +++++++++- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c index 40892e8a..ebec35a7 100644 --- a/lib/silcutil/silcutil.c +++ b/lib/silcutil/silcutil.c @@ -593,18 +593,3 @@ char *silc_get_input(const char *prompt, SilcBool echo_off) return NULL; #endif /* SILC_UNIX */ } - -/* Copies va_list */ - -void silc_va_copy(va_list dest, va_list src) -{ -#if defined(HAVE_VA_COPY) - va_copy(dest, src); -#elif defined(HAVE___VA_COPY) - __va_copy(dest, src); -#elif defined(SILC_VA_COPY_ARRAY) - memmove(dest, src, sizeof(va_list)); -#else - dest = src; -#endif -} diff --git a/lib/silcutil/silcutil.h b/lib/silcutil/silcutil.h index e6472582..142297c0 100644 --- a/lib/silcutil/silcutil.h +++ b/lib/silcutil/silcutil.h @@ -452,6 +452,14 @@ char *silc_get_real_name(); * each copied list. * ***/ -void silc_va_copy(va_list dest, va_list src); +#if defined(HAVE_VA_COPY) +#define silc_va_copy(dest, src) va_copy(dest, src); +#elif defined(HAVE___VA_COPY) +#define silc_va_copy(dest, src) __va_copy(dest, src); +#elif defined(SILC_VA_COPY_ARRAY) +#define silc_va_copy(dest, src) memmove(dest, src, sizeof(va_list)); +#else +#define silc_va_copy(dest, src) dest = src; +#endif #endif /* !SILCUTIL_H */ -- 2.24.0