From ed811eeaea83453df91fa564287cd2f1b7cb705f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 15 Jan 2016 12:16:06 -0800 Subject: Make the appropriate cast to protect from mingw. As the comment at the top of the file says: STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary. Bug: http://b/26523949 Change-Id: I9d86cafdc47bbb9ce0e967cdde9315babc083432 --- tools/aapt/Resource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/aapt/Resource.cpp') diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index a4e5d3de69c1..1b30d362a716 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -2107,7 +2107,7 @@ static status_t writeResourceLoadedCallbackForLayoutClasses( indentStr); } - return hasErrors ? UNKNOWN_ERROR : NO_ERROR; + return hasErrors ? STATUST(UNKNOWN_ERROR) : NO_ERROR; } static status_t writeResourceLoadedCallback( -- cgit v1.2.3-59-g8ed1b