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
