Return-Path: X-Original-To: apmail-perl-modperl-cvs-archive@www.apache.org Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 93DF6ED65 for ; Wed, 20 Feb 2013 09:08:13 +0000 (UTC) Received: (qmail 21338 invoked by uid 500); 20 Feb 2013 09:08:13 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 21269 invoked by uid 500); 20 Feb 2013 09:08:12 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@perl.apache.org List-Id: Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 21246 invoked by uid 99); 20 Feb 2013 09:08:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Feb 2013 09:08:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Feb 2013 09:08:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 68B232388993; Wed, 20 Feb 2013 09:07:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1448045 - /perl/modperl/branches/httpd24/xs/APR/Socket/APR__Socket.h Date: Wed, 20 Feb 2013 09:07:52 -0000 To: modperl-cvs@perl.apache.org From: jkaluza@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130220090752.68B232388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jkaluza Date: Wed Feb 20 09:07:51 2013 New Revision: 1448045 URL: http://svn.apache.org/r1448045 Log: * xs/APR/Socket/APR__Socket.h: Rename 'sock' to 'socket' to fix compilation Modified: perl/modperl/branches/httpd24/xs/APR/Socket/APR__Socket.h Modified: perl/modperl/branches/httpd24/xs/APR/Socket/APR__Socket.h URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/APR/Socket/APR__Socket.h?rev=1448045&r1=1448044&r2=1448045&view=diff ============================================================================== --- perl/modperl/branches/httpd24/xs/APR/Socket/APR__Socket.h (original) +++ perl/modperl/branches/httpd24/xs/APR/Socket/APR__Socket.h Wed Feb 20 09:07:51 2013 @@ -118,10 +118,10 @@ apr_status_t mpxs_APR__Socket_poll(apr_s } #ifndef WIN32 -static MP_INLINE int mpxs_APR__Socket_fileno(pTHX_ apr_socket_t *sock) +static MP_INLINE int mpxs_APR__Socket_fileno(pTHX_ apr_socket_t *socket) { apr_os_sock_t s; - apr_os_sock_get(&s, sock); + apr_os_sock_get(&s, socket); return s; } #endif