4 files changed, 2 insertions, 47 deletions
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 89e549ec19..dfc968f2e4 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -141,28 +141,11 @@ extern "C" {
 
 #define RUBY
 
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
 #undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
+#define _(args) args
 
 #undef __
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
+#define __(args) args
 
 #ifdef __cplusplus
 #define ANYARGS ...
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 48608f32c3..134bd86832 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -26,11 +26,7 @@ extern "C" {
 #include RUBY_EXTCONF_H
 #endif
 
-#ifdef HAVE_STDARG_PROTOTYPES
 # include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
 
 #include "ruby/st.h"
 
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
index 1d8a0198d8..f7c38013d0 100644
--- a/include/ruby/oniguruma.h
+++ b/include/ruby/oniguruma.h
@@ -65,19 +65,11 @@ extern "C" {
 #endif
 
 #ifndef P_
-#if defined(__STDC__) || defined(_WIN32)
 # define P_(args) args
-#else
-# define P_(args) ()
-#endif
 #endif
 
 #ifndef PV_
-#ifdef HAVE_STDARG_PROTOTYPES
 # define PV_(args) args
-#else
-# define PV_(args) ()
-#endif
 #endif
 
 #ifndef ONIG_EXTERN
diff --git a/include/ruby/util.h b/include/ruby/util.h
index 3b78e467b4..ef1e8fb2b8 100644
--- a/include/ruby/util.h
+++ b/include/ruby/util.h
@@ -25,24 +25,8 @@ extern "C" {
 #endif
 
 #ifndef _
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-#ifdef HAVE_PROTOTYPES
 # define _(args) args
-#else
-# define _(args) ()
-#endif
-#ifdef HAVE_STDARG_PROTOTYPES
 # define __(args) args
-#else
-# define __(args) ()
-#endif
 #endif
 
 RUBY_SYMBOL_EXPORT_BEGIN