From: Vadim Zeitlin Date: Sat, 19 May 2012 16:49:11 +0000 (+0000) Subject: Fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c564ca3c975aba89f8b911ace0f240c0aaf4cf73?ds=inline Fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case. Define the "unused" variable unless wxLogDebug() calls are variadic macros (not evaluating their arguments at all) and not functions. Fixes compilation broken since r71466. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/markupparser.cpp b/src/common/markupparser.cpp index cb87983b0e..929543c0a7 100644 --- a/src/common/markupparser.cpp +++ b/src/common/markupparser.cpp @@ -279,7 +279,12 @@ bool wxMarkupParser::Parse(const wxString& text) m_output.OnText(current); current.clear(); } -#if wxUSE_LOG_DEBUG + + // This variable is used only in the debugging messages + // and doesn't need to be defined if they're not compiled + // at all (it actually would result in unused variable + // messages in this case). +#if wxUSE_LOG_DEBUG && defined(HAVE_VARIADIC_MACROS) // Remember the tag starting position for the error // messages. const size_t pos = it - text.begin();