summaryrefslogtreecommitdiff
path: root/include/http_log.h
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2011-03-26 13:30:19 +0000
committerJeff Trawick <trawick@apache.org>2011-03-26 13:30:19 +0000
commit5d351b043ce4d880ff8f022518a20d1e93ba6912 (patch)
tree0509dcc42a6fa0fa71e37c740c8ffc95994a9761 /include/http_log.h
parent233d406469f729269fd03075cec18d6fbcafc17b (diff)
downloadhttpd-5d351b043ce4d880ff8f022518a20d1e93ba6912.tar.gz
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
Diffstat (limited to 'include/http_log.h')
-rw-r--r--include/http_log.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/http_log.h b/include/http_log.h
index b5b8ccf35c..46d7368da3 100644
--- 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