4 files changed, 4 insertions, 15 deletions
diff --git a/compile.c b/compile.c
index 01a740e701..3474a8fe9d 100644
--- a/compile.c
+++ b/compile.c
@@ -1209,7 +1209,7 @@ new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int a
     va_list argv;
     if (argc > 0) {
 	int i;
-	va_init_list(argv, argc);
+        va_start(argv, argc);
         operands = compile_data_alloc2(iseq, sizeof(VALUE), argc);
 	for (i = 0; i < argc; i++) {
 	    VALUE v = va_arg(argv, VALUE);
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 9ca521ad4f..2480e2e703 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -15,11 +15,7 @@
 #include "ruby/internal/config.h"
 #include "ruby/defines.h"
 
-#ifdef HAVE_STDARG_PROTOTYPES
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
+#include <stdarg.h>
 
 #include "ruby/st.h"
 
diff --git a/vm_core.h b/vm_core.h
index 3d9b190c2d..e725e4d8d0 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -49,14 +49,7 @@
 
 #include <stddef.h>
 #include <signal.h>
-
-#ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
-#define va_init_list(a,b) va_start((a),(b))
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start((a))
-#endif
 
 #include "ruby_assert.h"
 
diff --git a/vm_eval.c b/vm_eval.c
index 49cc92780b..80b3e90c86 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -891,7 +891,7 @@ rb_funcall(VALUE recv, ID mid, int n, ...)
     if (n > 0) {
 	long i;
 
-	va_init_list(ar, n);
+        va_start(ar, n);
 
 	argv = ALLOCA_N(VALUE, n);
 
@@ -1163,7 +1163,7 @@ rb_yield_values(int n, ...)
 	va_list args;
 	argv = ALLOCA_N(VALUE, n);
 
-	va_init_list(args, n);
+        va_start(args, n);
 	for (i=0; i<n; i++) {
 	    argv[i] = va_arg(args, VALUE);
 	}