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 <alec.j.salazar@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2588

diff --git a/include/sys/nvpair.h b/include/sys/nvpair.h
index 7a67870455f4ab5ea40ee2591d5fa9d70511c605..d2dfad5ca2b3f5ef57995d46233a4212c105cad2 100644 (file)
--- 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 fd3e0b0d4f91a20d96b1b5bb3d8cc0178c9142ca..bbb8a0463d9375e57a67758d13ec15e5366edb7d 100644 (file)
--- 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 04ad1480e8da04c3ce59d7913c3e0d2f1679ffcd..a36f5c77daa924c2a8c623d22d939a5c7c6ea5c9 100644 (file)
--- a/lib/libspl/include/sys/va_list.h
+++ b/lib/libspl/include/sys/va_list.h
@@ -29,8 +29,4 @@
 
 #include <stdarg.h>
 
-#ifndef __va_list
-typedef __gnuc_va_list __va_list;
-#endif
-
 #endif