From f1ae65488180c769f321b29a12cae5e914deffda Mon Sep 17 00:00:00 2001 From: "dbates@webkit.org" Date: Tue, 3 Dec 2013 19:31:21 +0000 Subject: [PATCH] ANGLE fails to build with trunk clang: unused constant kTraceBufferLen https://bugs.webkit.org/show_bug.cgi?id=125164 https://code.google.com/p/angleproject/issues/detail?id=534 Reviewed by Darin Adler. Move the definition of the constant kTraceBufferLen under the macro guard TRACE_ENABLED since it's only referenced in code guarded by TRACE_ENABLED. * src/compiler/debug.cpp: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160018 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/ThirdParty/ANGLE/ChangeLog | 14 ++++++++++++++ Source/ThirdParty/ANGLE/src/compiler/debug.cpp | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog index 4817745daa2..f069ce946c2 100644 --- a/Source/ThirdParty/ANGLE/ChangeLog +++ b/Source/ThirdParty/ANGLE/ChangeLog @@ -1,3 +1,17 @@ +2013-12-03 Daniel Bates + + ANGLE fails to build with trunk clang: unused constant kTraceBufferLen + https://bugs.webkit.org/show_bug.cgi?id=125164 + https://code.google.com/p/angleproject/issues/detail?id=534 + + Reviewed by Darin Adler. + + Move the definition of the constant kTraceBufferLen under the macro + guard TRACE_ENABLED since it's only referenced in code guarded by + TRACE_ENABLED. + + * src/compiler/debug.cpp: + 2013-11-21 Alex Christensen Remove ANGLEGenerated from Windows build. diff --git a/Source/ThirdParty/ANGLE/src/compiler/debug.cpp b/Source/ThirdParty/ANGLE/src/compiler/debug.cpp index 6a7b0425127..38d55acaf67 100644 --- a/Source/ThirdParty/ANGLE/src/compiler/debug.cpp +++ b/Source/ThirdParty/ANGLE/src/compiler/debug.cpp @@ -14,9 +14,9 @@ #include "compiler/InitializeParseContext.h" #include "compiler/ParseContext.h" +#ifdef TRACE_ENABLED static const int kTraceBufferLen = 1024; -#ifdef TRACE_ENABLED extern "C" { void Trace(const char *format, ...) { if (!format) return; -- GitLab