From d8bb885d5ec7a44f13795dea82a98d84d433342c Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 09:53:02 +0000
Subject: [PATCH] merges r20933 from trunk into ruby_1_9_1. 	*
 include/ruby/st.h: need to include defines.h because LONG_LONG is 	 
 defined there.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 5 +++++
 include/ruby/st.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a76d406f59..03f8f879c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 23 14:18:14 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/st.h: need to include defines.h because LONG_LONG is
+	  defined there.
+
 Tue Dec 23 13:52:05 2008  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/parser/c.rb:  Don't coalesce adjacent comment blocks.
diff --git a/include/ruby/st.h b/include/ruby/st.h
index 31bac7b1ad..09a7c58226 100644
--- a/include/ruby/st.h
+++ b/include/ruby/st.h
@@ -14,6 +14,7 @@ extern "C" {
 
 #ifndef RUBY_LIB
 #include "ruby/config.h"
+#include "ruby/defines.h"
 #ifdef RUBY_EXTCONF_H
 #include RUBY_EXTCONF_H
 #endif