summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c4
-rw-r--r--win32/win32.h2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 038891976..f0fb7c7a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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