summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/missing.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 21d5457ac3f..291a1bbe051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 26 14:08:47 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/missing.h: revert a part of r28727. config.h is expected
+ to include only once, before including defines.h.
+ including it here breaks some macro definitions.
+
Mon Jul 26 13:52:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in: define BROKEN_CLOSE only on FreeBSD.
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 8e4ffae72af..6d5ace5ed06 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -18,8 +18,6 @@ extern "C" {
#endif
#endif
-#include "ruby/config.h"
-
#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
#elif !defined(_WIN32)