summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-30 19:22:51 +0000
committertarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-30 19:22:51 +0000
commite31fb65d57d9c7341e6590cad5c140d38a6f2715 (patch)
treedc6a42021c989b76d3406a9006a0cab6f73cdd2a
parent870d0316673fdfd819c200da534d0a614415e89d (diff)
merge from trunk (r28408)
* ext/socket/raddrinfo.c: don't use __P. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/raddrinfo.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 43cedd3f2a..0722f312aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 1 04:21:10 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/raddrinfo.c: don't use __P.
+
Wed Jun 30 07:29:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/test_rubyoptions.rb (test_script_from_stdin): by using
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index 54b62aae37..a0a894ce47 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -97,7 +97,7 @@ ruby_getnameinfo__aix(const struct sockaddr *sa, size_t salen,
ruby_getnameinfo__aix((sa), (salen), (host), (hostlen), (serv), (servlen), (flags))
#endif
-static int str_isnumber __P((const char *));
+static int str_isnumber(const char *);
#if defined(__APPLE__)
/* fix [ruby-core:29427] */