diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-03 08:26:43 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-03 08:26:43 +0000 |
| commit | 5ed5d99d2cd11fcf345ccdef048770fb11377820 (patch) | |
| tree | b188d4218d8164ca63215907aac75c30c05cfc2a | |
| parent | 10ae3a1f5ef2a5b9e9a7540c62b662bf0a050dfa (diff) | |
| download | ruby-5ed5d99d2cd11fcf345ccdef048770fb11377820.tar.gz ruby-5ed5d99d2cd11fcf345ccdef048770fb11377820.tar.xz ruby-5ed5d99d2cd11fcf345ccdef048770fb11377820.zip | |
* win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
(backported from HEAD)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 4 | ||||
| -rw-r--r-- | win32/win32.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Apr 3 17:16:33 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32. + (backported from HEAD) + Sat Apr 2 23:38:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (CP, INSTALL): get rid of less portable options. diff --git a/win32/win32.c b/win32/win32.c index b9c09785d..a72ee909b 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3464,9 +3464,9 @@ rb_w32_fopen(const char *path, const char *mode) } FILE * -rb_w32_fdopen(int handle, char *type) +rb_w32_fdopen(int handle, const char *type) { - FILE *f = (errno = 0, _fdopen(handle, type)); + FILE *f = (errno = 0, _fdopen(handle, (char *)type)); if (f == NULL && errno == 0) { if (handle < 0) errno = EBADF; diff --git a/win32/win32.h b/win32/win32.h index 9f0e41fbb..c3cdb2e2e 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -197,7 +197,7 @@ extern int rb_w32_rmdir(const char *); #ifdef __BORLANDC__ extern FILE *rb_w32_fopen(const char *, const char *); -extern FILE *rb_w32_fdopen(int, char *); +extern FILE *rb_w32_fdopen(int, const char *); extern FILE *rb_w32_fsopen(const char *, const char *, int); #endif |