# HG changeset patch # User Petr Sumbera # Date 1553586749 25200 # Tue Mar 26 00:52:29 2019 -0700 # Node ID 0c3fc060e5bc58cf35446c1fc148b074b7d02813 # Parent 9e7ad7cbdae1a8a4c3ffe31f6023d8370b7b61fc Angle ERR issue diff -r 9e7ad7cbdae1 -r 0c3fc060e5bc gfx/angle/checkout/src/common/debug.h --- a/gfx/angle/checkout/src/common/debug.h Tue Mar 26 01:30:10 2019 -0700 +++ b/gfx/angle/checkout/src/common/debug.h Tue Mar 26 00:52:29 2019 -0700 @@ -226,6 +226,7 @@ #endif #define WARN() ANGLE_LOG(WARN) +#undef ERR // as it's coming from Solaris regset.h #define ERR() ANGLE_LOG(ERR) // A macro to log a performance event around a scope.