From: Jeff Trawick <trawick@apache.org>
Date: Sat, 26 Mar 2011 14:22:58 +0000 (+0000)
Subject: aplog_module_index must always be set for C++, so simplify
X-Git-Tag: 2.3.12~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c50305fbb3038762c6158d714c35fea7b03b972;p=thirdparty%2Fapache%2Fhttpd.git

aplog_module_index must always be set for C++, so simplify
the APLOG_MODULE_INDEX macro to avoid warnings with some
C++ compilers


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

diff --git a/include/http_log.h b/include/http_log.h
index 46d7368da37..d635ab1cf25 100644
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -154,8 +154,12 @@ static int * const aplog_module_index;
  * @see APLOG_MARK
  * @see ap_log_error
  */
+#ifdef __cplusplus
+#define APLOG_MODULE_INDEX (*aplog_module_index)
+#else /* __cplusplus */
 #define APLOG_MODULE_INDEX  \
     (aplog_module_index ? *aplog_module_index : APLOG_NO_MODULE)
+#endif /* __cplusplus */
 
 /**
  * APLOG_MAX_LOGLEVEL can be defined to remove logging above some