summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-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
7 files changed, 25 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 57733d8324..7214d436db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 27 18:33:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * defines.h, intern.h, missing.h, ruby.h, st.h, util.h: include
+ config.h and defines.h for autoconf macros.
+
Tue Jul 27 16:27:38 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (flo_cmp): typo.
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 45b19bdc58..51b2eb816d 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 8c3c32e226..338c8bb1b7 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 6d5ace5ed0..bed633d379 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 11e3bb819a..576e4cd23c 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 53e82618f1..5627124e39 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 ee8e726572..b025fb61ec 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