Commit 4640d62a authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Correct C++ incompatibility with http_log.h. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085719 13f79535-47bb-0310-9956-ffa450edef68
parent c19dc998

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.3.12



  *) Correct C++ incompatibility with http_log.h.  [Stefan Fritsch, Jeff

     Trawick]



  *) mod_log_config: Prevent segfault. PR 50861. [Torsten Förtsch

     <torsten.foertsch gmx.net>]

include/http_log.h

+9 −0
Changes for include/http_log.h: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -121,6 +121,14 @@ extern "C" { 
 */

#define APLOG_NO_MODULE         -1



#ifdef __cplusplus

/**

 * C++ modules must invoke ::APLOG_USE_MODULE or ::AP_DECLARE_MODULE in

 * every file which uses ap_log_*.

 * (C modules *should* do that as well, to enable module-specific log

 * levels).

 */

#else /* __cplusplus */

/**

 * Constant to store module_index for the current file.

 * Objects with static storage duration are set to NULL if not
@@ -130,6 +138,7 @@ extern "C" { 
 * use ::APLOG_NO_MODULE. This variable will usually be optimized away.

 */

static int * const aplog_module_index;

#endif /* __cplusplus */



/**

 * APLOG_MODULE_INDEX contains the module_index of the current module if