Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 11549 invoked from network); 6 Aug 2010 17:55:00 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Aug 2010 17:55:00 -0000 Received: (qmail 47940 invoked by uid 500); 6 Aug 2010 17:55:00 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 47906 invoked by uid 500); 6 Aug 2010 17:55:00 -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 47885 invoked by uid 99); 6 Aug 2010 17:55:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Aug 2010 17:55:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 06 Aug 2010 17:54:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E7A5F23889E3; Fri, 6 Aug 2010 17:53:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r983071 - in /perl/modperl/branches/release/2.0.5: ./ xs/APR/OS/APR__OS.h Date: Fri, 06 Aug 2010 17:53:40 -0000 To: modperl-cvs@perl.apache.org From: pgollucci@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100806175340.E7A5F23889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pgollucci Date: Fri Aug 6 17:53:40 2010 New Revision: 983071 URL: http://svn.apache.org/viewvc?rev=983071&view=rev Log: MFT: r983068 Fix on fbsd amd64 where U32 is 4 bytes and pthread_t is 8. xs/APR/OS/APR__OS.h: In function 'mpxs_APR__OS_current_thread_id': xs/APR/OS/APR__OS.h:20: warning: cast from pointer to integer of different size Consistently cast this to an unsigned long. Modified: perl/modperl/branches/release/2.0.5/ (props changed) perl/modperl/branches/release/2.0.5/xs/APR/OS/APR__OS.h Propchange: perl/modperl/branches/release/2.0.5/ ------------------------------------------------------------------------------ svn:mergeinfo = /perl/modperl/trunk:983068 Modified: perl/modperl/branches/release/2.0.5/xs/APR/OS/APR__OS.h URL: http://svn.apache.org/viewvc/perl/modperl/branches/release/2.0.5/xs/APR/OS/APR__OS.h?rev=983071&r1=983070&r2=983071&view=diff ============================================================================== --- perl/modperl/branches/release/2.0.5/xs/APR/OS/APR__OS.h (original) +++ perl/modperl/branches/release/2.0.5/xs/APR/OS/APR__OS.h Fri Aug 6 17:53:40 2010 @@ -14,10 +14,10 @@ * limitations under the License. */ -static MP_INLINE U32 mpxs_APR__OS_current_thread_id(pTHX) +static MP_INLINE unsigned long mpxs_APR__OS_current_thread_id(pTHX) { #if APR_HAS_THREADS - return (U32)apr_os_thread_current(); + return (unsigned long)apr_os_thread_current(); #else return 0; #endif