httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1085719 - in /httpd/httpd/trunk: CHANGES include/http_log.h
Date Sat, 26 Mar 2011 13:30:19 GMT
Author: trawick
Date: Sat Mar 26 13:30:19 2011
New Revision: 1085719

URL: http://svn.apache.org/viewvc?rev=1085719&view=rev
Log:
Correct C++ incompatibility with http_log.h.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/include/http_log.h

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1085719&r1=1085718&r2=1085719&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Mar 26 13:30:19 2011
@@ -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>]
 

Modified: httpd/httpd/trunk/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_log.h?rev=1085719&r1=1085718&r2=1085719&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_log.h (original)
+++ httpd/httpd/trunk/include/http_log.h Sat Mar 26 13:30:19 2011
@@ -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



Mime
View raw message