Skip to content

S
swiftshader
Commit 4dd1eff4 by Nicolas Capens Committed by Nicolas Capens
Options

Work around stlport build bug.

Older versions of Android using stlport were failing to compile with an "assert has been defined before inclusion of assert.h header" error. Change-Id: If8e13eb08c35a34d082d99f8f57188bc55697f59 Reviewed-on: https://swiftshader-review.googlesource.com/11270Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 99cb565a
Showing with 2 additions and 1 deletion
src/Common/DebugAndroid.hpp
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#define DebugAndroid_hpp #define DebugAndroid_hpp
#include <cutils/log.h> #include <cutils/log.h>
#include <cassert>
// On Android Virtual Devices we heavily depend on logging, even in // On Android Virtual Devices we heavily depend on logging, even in
// production builds. We do this because AVDs are components of larger // production builds. We do this because AVDs are components of larger
......
src/Reactor/Reactor.hpp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "Nucleus.hpp" #include "Nucleus.hpp"
#include "Routine.hpp" #include "Routine.hpp"
#include <assert.h> #include <cassert>
#include <cstddef> #include <cstddef>
#include <cwchar> #include <cwchar>
#undef Bool #undef Bool
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment