From 22a11a5b5abc6b82972f8c6fa1d9b6efab3a4ab5 Mon Sep 17 00:00:00 2001 From: Alec Salazar Date: Tue, 5 Aug 2014 09:10:54 -0400 Subject: [PATCH] Replace __va_list with va_list Most of the code base already uses va_list, which is specified by iso-c. gcc/glibc provides 'typedef __gnuc_va_list va_list'. and when not using gcc/glibc we can't expect to find __gnuc_va_list. Signed-off-by: Alec Salazar Signed-off-by: Brian Behlendorf Closes #2588 --- include/sys/nvpair.h | 2 +- include/sys/zfs_context.h | 4 ++-- lib/libspl/include/sys/va_list.h | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/sys/nvpair.h b/include/sys/nvpair.h index 7a6787045..d2dfad5ca 100644 --- a/include/sys/nvpair.h +++ b/include/sys/nvpair.h @@ -132,7 +132,7 @@ typedef struct nv_alloc { } nv_alloc_t; struct nv_alloc_ops { - int (*nv_ao_init)(nv_alloc_t *, __va_list); + int (*nv_ao_init)(nv_alloc_t *, va_list); void (*nv_ao_fini)(nv_alloc_t *); void *(*nv_ao_alloc)(nv_alloc_t *, size_t); void (*nv_ao_free)(nv_alloc_t *, void *, size_t); diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index fd3e0b0d4..bbb8a0463 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -148,9 +148,9 @@ extern void dprintf_setup(int *argc, char **argv); extern void __dprintf(const char *file, const char *func, int line, const char *fmt, ...); extern void cmn_err(int, const char *, ...); -extern void vcmn_err(int, const char *, __va_list); +extern void vcmn_err(int, const char *, va_list); extern void panic(const char *, ...); -extern void vpanic(const char *, __va_list); +extern void vpanic(const char *, va_list); #define fm_panic panic diff --git a/lib/libspl/include/sys/va_list.h b/lib/libspl/include/sys/va_list.h index 04ad1480e..a36f5c77d 100644 --- a/lib/libspl/include/sys/va_list.h +++ b/lib/libspl/include/sys/va_list.h @@ -29,8 +29,4 @@ #include -#ifndef __va_list -typedef __gnuc_va_list __va_list; -#endif - #endif