summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-01 07:02:54 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-01 07:02:54 +0000
commit4ff2f42eeb69404d53a30525686a071bf16cf3b4 (patch)
treef922eb1b1580da830e8d130e8fb484b9b290f84a
parentad0fdf437a7dd3f25e6171d300913b0d4d45162e (diff)
downloadruby-4ff2f42eeb69404d53a30525686a071bf16cf3b4.tar.gz
ruby-4ff2f42eeb69404d53a30525686a071bf16cf3b4.tar.xz
ruby-4ff2f42eeb69404d53a30525686a071bf16cf3b4.zip
* io.c (READ_DATA_PENDING_PTR): cast to get rid of warnings.
* ext/socket/socket.c (unix_send_io, unix_recv_io): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/socket/socket.c2
-rw-r--r--io.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f79faa9a..b35dd10a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 1 16:02:46 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (READ_DATA_PENDING_PTR): cast to get rid of warnings.
+
+ * ext/socket/socket.c (unix_send_io, unix_recv_io): ditto.
+
Fri Aug 1 15:53:24 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (isInternalCmd): shouldn't return if find end of str.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 590d2c31b..13329eedc 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1565,6 +1565,7 @@ unix_send_io(sock, val)
return Qnil;
#else
rb_notimplement();
+ return Qnil; /* not reached */
#endif
}
@@ -1656,6 +1657,7 @@ unix_recv_io(argc, argv, sock)
}
#else
rb_notimplement();
+ return Qnil; /* not reached */
#endif
}
diff --git a/io.c b/io.c
index aba4dc22c..536b8b293 100644
--- a/io.c
+++ b/io.c
@@ -144,7 +144,7 @@ extern int ReadDataPending();
#ifndef READ_DATA_PENDING_PTR
# ifdef FILE_READPTR
-# define READ_DATA_PENDING_PTR(fp) ((fp)->FILE_READPTR)
+# define READ_DATA_PENDING_PTR(fp) ((char *)(fp)->FILE_READPTR)
# endif
#endif