1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* intern.h, file.c: failed to compile on windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-11-23 02:06:00 +00:00
parent b54ab5610b
commit 2cb3480d22
3 changed files with 9 additions and 4 deletions

View file

@ -1,3 +1,7 @@
Wed Nov 23 11:01:33 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* intern.h, file.c: failed to compile on windows.
Wed Nov 23 07:26:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.

8
file.c
View file

@ -676,10 +676,10 @@ w32_io_info(file, st)
OpenFile *fptr;
GetOpenFile(tmp, fptr);
f = (HANDLE)rb_w32_get_osfhandle(fptr->fd);
f = (HANDLE)rb_w32_get_osfhandle(fileno(fptr->f));
}
else {
FilePathValue(*file);
SafeStringValue(*file);
f = CreateFile(StringValueCStr(*file), 0, 0, NULL,
OPEN_EXISTING, 0, NULL);
if (f == INVALID_HANDLE_VALUE) return f;
@ -1427,9 +1427,9 @@ test_identical(obj, fname1, fname2)
if (!f1 || !f2) return Qfalse;
if (rb_w32_iswin95()) return Qfalse;
#else
FilePathValue(fname1);
SafeStringValue(fname1);
fname1 = rb_str_new4(fname1);
FilePathValue(fname2);
SafeStringValue(fname2);
if (access(RSTRING(fname1)->ptr, 0)) return Qfalse;
if (access(RSTRING(fname2)->ptr, 0)) return Qfalse;
#endif

View file

@ -223,6 +223,7 @@ VALUE rb_funcall_rescue __((VALUE, ID, int, ...));
/* file.c */
int eaccess _((const char*, int));
VALUE rb_file_s_expand_path _((int, VALUE *));
VALUE rb_file_expand_path _((VALUE, VALUE));
void rb_file_const _((const char*, VALUE));
int rb_find_file_ext _((VALUE*, const char* const*));
VALUE rb_find_file _((VALUE));