Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 98419 invoked from network); 26 Mar 2011 14:23:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Mar 2011 14:23:23 -0000 Received: (qmail 29892 invoked by uid 500); 26 Mar 2011 14:23:23 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 29824 invoked by uid 500); 26 Mar 2011 14:23:23 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 29817 invoked by uid 99); 26 Mar 2011 14:23:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Mar 2011 14:23:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Mar 2011 14:23:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F911238890D; Sat, 26 Mar 2011 14:22:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1085724 - /httpd/httpd/trunk/include/http_log.h Date: Sat, 26 Mar 2011 14:22:59 -0000 To: cvs@httpd.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110326142259.4F911238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Sat Mar 26 14:22:58 2011 New Revision: 1085724 URL: http://svn.apache.org/viewvc?rev=1085724&view=rev Log: aplog_module_index must always be set for C++, so simplify the APLOG_MODULE_INDEX macro to avoid warnings with some C++ compilers Modified: httpd/httpd/trunk/include/http_log.h Modified: httpd/httpd/trunk/include/http_log.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_log.h?rev=1085724&r1=1085723&r2=1085724&view=diff ============================================================================== --- httpd/httpd/trunk/include/http_log.h (original) +++ httpd/httpd/trunk/include/http_log.h Sat Mar 26 14:22:58 2011 @@ -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