From f8bdd2227c96d510c4e7dc6cfd909ed307115d2b Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 21 Dec 2006 12:36:28 +0000
Subject:  r12@ruby:  shyouhei | 2006-12-21 21:09:03 +0900  *
 ext/openssl/ossl.h: fixed compilation problem on gcc 3.2.   
 [ruby-talk:214786]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  5 +++++
 ext/openssl/ossl.h | 20 +++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index faceccbbfc..7c384179c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 21 20:11:31 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ext/openssl/ossl.h: fixed compilation problem on gcc 3.2.
+	  [ruby-talk:214786]
+
 Sat Dec 16 04:02:10 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index c0325229c1..af27bae6a6 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -18,13 +18,10 @@ extern "C" {
 #endif
 
 /*
-* OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
-*/
-#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
-#  undef RFILE
-#endif
-#include <ruby.h>
-#include <rubyio.h>
+ *_FILE_OFFSET_BITS needs to be defined before some system headers on
+ * Solaris.
+ */
+#include "config.h"
 
 /*
  * Check the OpenSSL version
@@ -68,6 +65,15 @@ extern "C" {
 #  undef OpenFile
 #endif
 
+/*
+ * OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
+ */
+#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
+#  undef RFILE
+#endif
+#include <ruby.h>
+#include <rubyio.h>
+
 /*
  * Common Module
  */
-- 
cgit v1.2.3