summaryrefslogtreecommitdiff
path: root/include/ruby
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-27 09:33:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-27 09:33:55 +0000
commit58f1d31a1ddd071f092600d155601592f3930163 (patch)
treef46a94cc1155f22d323d87aded8edda6d6d53890 /include/ruby
parent592d885caa63c13cfec14cfc9b48ddc3bc55bb57 (diff)
* defines.h, intern.h, missing.h, ruby.h, st.h, util.h: include
config.h and defines.h for autoconf macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
-rw-r--r--include/ruby/defines.h5
-rw-r--r--include/ruby/intern.h5
-rw-r--r--include/ruby/missing.h5
-rw-r--r--include/ruby/ruby.h2
-rw-r--r--include/ruby/st.h6
-rw-r--r--include/ruby/util.h5
6 files changed, 20 insertions, 8 deletions
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 45b19bdc58b..51b2eb816d9 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -17,6 +17,11 @@ extern "C" {
#endif
#endif
+#include "ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
#define RUBY
#include <stdlib.h>
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 8c3c32e226e..338c8bb1b73 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -21,6 +21,11 @@ extern "C" {
#endif
#endif
+#include "ruby/defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
#ifdef HAVE_STDARG_PROTOTYPES
# include <stdarg.h>
#else
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 6d5ace5ed06..bed633d3799 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -18,6 +18,11 @@ extern "C" {
#endif
#endif
+#include "ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
#elif !defined(_WIN32)
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 11e3bb819a3..576e4cd23c6 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -21,12 +21,10 @@ extern "C" {
#endif
#endif
-#ifndef RUBY_LIB_PREFIX
#include "ruby/config.h"
#ifdef RUBY_EXTCONF_H
#include RUBY_EXTCONF_H
#endif
-#endif
#define NORETURN_STYLE_NEW 1
#ifndef NORETURN
diff --git a/include/ruby/st.h b/include/ruby/st.h
index 53e82618f11..5627124e39e 100644
--- a/include/ruby/st.h
+++ b/include/ruby/st.h
@@ -12,13 +12,7 @@ extern "C" {
#endif
#endif
-#ifndef RUBY_LIB_PREFIX
-#include "ruby/config.h"
#include "ruby/defines.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-#endif
#if defined STDC_HEADERS
#include <stddef.h>
diff --git a/include/ruby/util.h b/include/ruby/util.h
index ee8e726572c..b025fb61ec7 100644
--- a/include/ruby/util.h
+++ b/include/ruby/util.h
@@ -19,6 +19,11 @@ extern "C" {
#endif
#endif
+#include "ruby/defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
#ifndef _
#ifdef __cplusplus
# ifndef HAVE_PROTOTYPES