summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-25 11:18:26 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-25 11:18:26 (GMT)
commitb3a71949487cba458f3b6882fecb1dcd54c8a0d6 (patch)
tree482b067cfd60bf25e3497ff7b2234d587b1a4781
parentc891c96e1f10aa3144afd4c5a83b04b63ba0d810 (diff)
* 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@11420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/ossl.h20
-rw-r--r--version.h2
3 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 77e9b66..d78082e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 25 20:08:28 2006 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * ext/openssl/ossl.h: fixed compilation problem on gcc 3.2.
+ [ruby-talk:214786]
+
Mon Dec 25 10:40:40 2006 URABE Shyouhei <shyouhei@ruby-lang.org>
* stable version 1.8.5-p12 released.
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index c032522..af27bae 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
@@ -69,6 +66,15 @@ 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>
+
+/*
* Common Module
*/
extern VALUE mOSSL;
diff --git a/version.h b/version.h
index 24aa6d1..20556e3 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2006-12-25"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20061225
-#define RUBY_PATCHLEVEL 12
+#define RUBY_PATCHLEVEL 13
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8