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

diff --git a/CHANGES b/CHANGES
index a6d8e122f0acd3a283f10ea914989700bd78d4ea..2dd5a032045ac25e23ca14f861b754d8ec8e9ce2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]
 

diff --git a/include/http_log.h b/include/http_log.h
index b5b8ccf35c84433f7410bc2d45cc9d9ae115b2c0..46d7368da37550900e91813688acb3a26746cf24 100644 (file)
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -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