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
ruby · Jun 30, 2010 · e31fb65 · e31fb65
1 parent 870d031
commit e31fb65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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] */