| commit | 50f1a73b12d3ec0321b3710d497e0fd46563a088 | [log] [tgz] |
|---|---|---|
| author | Nicolas Capens <capn@google.com> | Fri Jan 01 23:24:01 2016 -0500 |
| committer | Nicolas Capens <capn@google.com> | Sat Jan 09 02:43:21 2016 +0000 |
| tree | fbab7fd72c709db3ef5179242708800ebf6fe89f | |
| parent | 485f92cdef2f8ddc7a17e7d897341efe331069ec [diff] [blame] |
Fix macro redefinition warning. Bug 15387371 Change-Id: I1d9524b15a62a561508a5cc2b76ba0b1e8d37fdc Reviewed-on: https://swiftshader-review.googlesource.com/4495 Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/Common/DebugAndroid.hpp b/src/Common/DebugAndroid.hpp index 504401e..2d2eb49 100644 --- a/src/Common/DebugAndroid.hpp +++ b/src/Common/DebugAndroid.hpp
@@ -34,6 +34,7 @@ } \ } while(0) +#undef assert #define assert(E) ASSERT(E) #define ERR(format, ...) \