summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-17 06:16:33 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-17 06:16:33 +0000
commit886995ef6973575e24f41aee252cb1b4b880ff8f (patch)
tree87a408ce53f5354a8aa53f227b5dd92219177e73
parent64497c8501c7441a73bb39c3766b287ff413d701 (diff)
merges r20758 from trunk into ruby_1_9_1.
* ext/pty/pty.c (chfunc): make it static. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/pty/pty.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a1285799c4..81f3bf73ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 15 21:01:46 2008 Tanaka Akira <akr@fsij.org>
+
+ * ext/pty/pty.c (chfunc): make it static.
+
Mon Dec 15 20:16:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 089322967b..ce805544fb 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -192,7 +192,8 @@ struct child_info {
VALUE *argv;
};
-int chfunc(void *data)
+static int
+chfunc(void *data)
{
struct child_info *carg = data;
int master = carg->master;