aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2017-04-14 09:59:15 +0900
committerKazuki Yamaguchi <k@rhe.jp>2017-09-09 16:32:29 +0900
commit18846cf7d152cf545154d13da5fb2ca365d28ed1 (patch)
treecfa69258d58cbfbaccf7fb9324da209bf8535baa /include
parent434fd3f01b1d08011dbe8d252bab57265dde53da (diff)
downloadruby-18846cf7d152cf545154d13da5fb2ca365d28ed1.tar.gz
configure.in: assume stdarg.h exists
It is part of C89.
Diffstat (limited to 'include')
-rw-r--r--include/ruby/defines.h18
-rw-r--r--include/ruby/intern.h6
2 files changed, 7 insertions, 17 deletions
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 250b7b7ce2..cf585f210d 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -144,25 +144,19 @@ extern "C" {
#define RUBY
-#ifdef __cplusplus
-# ifndef HAVE_STDARG_PROTOTYPES
-# define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
/* No longer used since 2.5; kept for backwards compatibility */
-#ifndef HAVE_PROTOTYPES
+#ifndef HAVE_PROTOTYPES
# define HAVE_PROTOTYPES 1
#endif
#undef _
#define _(args) args
-#undef __
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
+/* No longer used since 2.5; kept for backwards compatibility */
+#ifndef HAVE_STDARG_PROTOTYPES
+# define HAVE_STDARG_PROTOTYPES 1
#endif
+#undef __
+#define __(args) args
#ifdef __cplusplus
#define ANYARGS ...
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 9b6a8d7dea..6c6a86fbe2 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 <stdarg.h>
#include "ruby/st.h"