2 # User Petr Sumbera <petr.sumbera@oracle.com>
3 # Date 1553586749 25200
4 # Tue Mar 26 00:52:29 2019 -0700
5 # Node ID 0c3fc060e5bc58cf35446c1fc148b074b7d02813
6 # Parent 9e7ad7cbdae1a8a4c3ffe31f6023d8370b7b61fc
9 diff -r 9e7ad7cbdae1 -r 0c3fc060e5bc gfx/angle/checkout/src/common/debug.h
10 --- a/gfx/angle/checkout/src/common/debug.h Tue Mar 26 01:30:10 2019 -0700
11 +++ b/gfx/angle/checkout/src/common/debug.h Tue Mar 26 00:52:29 2019 -0700
15 #define WARN() ANGLE_LOG(WARN)
16 +#undef ERR // as it's coming from Solaris regset.h
17 #define ERR() ANGLE_LOG(ERR)
19 // A macro to log a performance event around a scope.