On Wed, Aug 15, 2012 at 3:40 AM, Rainer Jung <[email protected]> wrote: > Hi Jeff, > > > On 14.08.2012 22:48, [email protected] wrote: >> >> Author: trawick >> Date: Tue Aug 14 20:48:12 2012 >> New Revision: 1373078 >> >> URL: http://svn.apache.org/viewvc?rev=1373078&view=rev >> Log: >> Merge parts of r896382 applicable to apr 1.5.x from trunk: >> >> Fixes various doxygen usage warnings and minor doxygen errors. >> Submitted by: Neil Conway <[email protected]> >> >> (These changes were committed to the 1.3.x and 1.4.x branches >> long ago with r896406 and r896402.) >> >> Modified: >> apr/apr/branches/1.5.x/ (props changed) >> apr/apr/branches/1.5.x/include/apr_file_io.h >> apr/apr/branches/1.5.x/include/apr_network_io.h >> apr/apr/branches/1.5.x/include/apr_thread_proc.h >> apr/apr/branches/1.5.x/include/apr_want.h >> >> Propchange: apr/apr/branches/1.5.x/ >> >> ------------------------------------------------------------------------------ >> Merged /apr/apr/trunk:r896382 >> > > Did you want to commit the following changes: > > >> Modified: apr/apr/branches/1.5.x/include/apr_thread_proc.h >> URL: >> http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_thread_proc.h?rev=1373078&r1=1373077&r2=1373078&view=diff >> >> ============================================================================== >> --- apr/apr/branches/1.5.x/include/apr_thread_proc.h (original) >> +++ apr/apr/branches/1.5.x/include/apr_thread_proc.h Tue Aug 14 20:48:12 >> 2012 >> @@ -730,13 +730,13 @@ APR_DECLARE(void) apr_proc_other_child_u >> * <pre> >> * rv = apr_proc_wait_all_procs(&proc, &exitcode, &status, APR_WAIT, p); >> * if (APR_STATUS_IS_CHILD_DONE(rv)) { >> - * #if APR_HAS_OTHER_CHILD >> + * \#if APR_HAS_OTHER_CHILD >> * if (apr_proc_other_child_alert(&proc, APR_OC_REASON_DEATH, >> status) >> * == APR_SUCCESS) { >> * ; (already handled) >> * } >> * else >> - * #endif >> + * \#endif >> * [... handling non-otherchild processes death ...] >> * </pre> >> */ >> >> Modified: apr/apr/branches/1.5.x/include/apr_want.h >> URL: >> http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_want.h?rev=1373078&r1=1373077&r2=1373078&view=diff >> >> ============================================================================== >> --- apr/apr/branches/1.5.x/include/apr_want.h (original) >> +++ apr/apr/branches/1.5.x/include/apr_want.h Tue Aug 14 20:48:12 2012 >> @@ -30,9 +30,9 @@ >> * >> * Typical usage: >> * >> - * #define APR_WANT_STRFUNC >> - * #define APR_WANT_MEMFUNC >> - * #include "apr_want.h" >> + * \#define APR_WANT_STRFUNC >> + * \#define APR_WANT_MEMFUNC >> + * \#include "apr_want.h" >> * >> * The appropriate headers will be included. >> * > > > Probably some debugging leftover?
uhhh, it was all intended... it matches the corresponding files in 1.4.x and trunk -- Born in Roswell... married an alien... http://emptyhammock.com/
