From 5b10c170e52d53e570b6335590552a12b002c361 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 24 Feb 2007 10:30:50 +0000
Subject: * file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):  
 renamed from OpenFile.

* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
  ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
  ext/readline/readline.c, ext/socket/socket.c: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/openssl/ossl.h     | 4 ----
 ext/openssl/ossl_bio.c | 2 +-
 ext/openssl/ossl_ssl.c | 8 ++++----
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'ext/openssl')

diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 3be563005c..f8d2514a61 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -40,7 +40,6 @@ extern "C" {
 #endif
 
 #if defined(_WIN32)
-#  define OpenFile WINAPI_OpenFile
 #  define OSSL_NO_CONF_API 1
 #  include <winsock2.h>
 #endif
@@ -65,9 +64,6 @@ extern "C" {
 #  define OSSL_OCSP_ENABLED
 #  include <openssl/ocsp.h>
 #endif
-#if defined(_WIN32)
-#  undef OpenFile
-#endif
 
 /*
  * Common Module
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index aa0b99fe8c..1358478acb 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -19,7 +19,7 @@ ossl_obj2bio(VALUE obj)
     BIO *bio;
 
     if (TYPE(obj) == T_FILE) {
-	OpenFile *fptr;
+	rb_io_t *fptr;
 	FILE *fp;
 	int fd;
 
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index d956c908be..e9fcbd3634 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -533,7 +533,7 @@ ossl_ssl_setup(VALUE self)
     VALUE io, v_ctx, cb;
     SSL_CTX *ctx;
     SSL *ssl;
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     Data_Get_Struct(self, SSL, ssl);
     if(!ssl){
@@ -573,7 +573,7 @@ static VALUE
 ossl_start_ssl(VALUE self, int (*func)())
 {
     SSL *ssl;
-    OpenFile *fptr;
+    rb_io_t *fptr;
     int ret;
 
     Data_Get_Struct(self, SSL, ssl);
@@ -617,7 +617,7 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
     SSL *ssl;
     int ilen, nread = 0;
     VALUE len, str;
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     rb_scan_args(argc, argv, "11", &len, &str);
     ilen = NUM2INT(len);
@@ -673,7 +673,7 @@ ossl_ssl_write(VALUE self, VALUE str)
 {
     SSL *ssl;
     int nwrite = 0;
-    OpenFile *fptr;
+    rb_io_t *fptr;
 
     StringValue(str);
     Data_Get_Struct(self, SSL, ssl);
-- 
cgit v1.2.3