Author: pgollucci
Date: Fri Sep 23 11:51:01 2005
New Revision: 291189

URL: http://svn.apache.org/viewcvs?rev=291189&view=rev
Log:
Fix a cirtical but trivial but that would cause MP_MAINTAINER=1
or MP_TRACE=1 builds to fail if not building against a threaded APR.
Functions such as apr_os_thread_current() would not be linked in,
but were expected to be.

The reason being that APR_HAS_THREADS is always "defined" by apr
whether its 0 or 1.



Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/src/modules/perl/modperl_util.h

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=291189&r1=291188&r2=291189&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Sep 23 11:51:01 2005
@@ -12,6 +12,12 @@
 
 =item 2.0.2-dev
 
+Fix a cirtical but trivial but that would cause MP_MAINTAINER=1
+or MP_TRACE=1 builds to fail if not building against a threaded APR.
+Functions such as apr_os_thread_current() would not be linked in,
+but were expected to be.
+[Philip M. Gollucci]
+
 Add the output of ldd(unix/cygwin) and otool -L (darwin)
 for httpd to the mp2bug report script.
 [Philip M. Gollucci]

Modified: perl/modperl/trunk/src/modules/perl/modperl_util.h
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_util.h?rev=291189&r1=291188&r2=291189&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_util.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_util.h Fri Sep 23 11:51:01 2005
@@ -100,7 +100,7 @@
 apr_array_header_t *modperl_avrv2apr_array_header(pTHX_ apr_pool_t *p,
                                                   SV *avrv);
 void modperl_package_unload(pTHX_ const char *package);
-#if defined(MP_TRACE) && defined(APR_HAS_THREADS)
+#if defined(MP_TRACE) && APR_HAS_THREADS
 #define MP_TRACEf_TID   "/tid 0x%lx"
 #define MP_TRACEv_TID   (unsigned long)apr_os_thread_current()
 #define MP_TRACEv_TID_  MP_TRACEv_TID,


Reply via email to