diff --git a/hyper.h b/hyper.h index 176b744e..5c6168bc 100644 --- a/hyper.h +++ b/hyper.h @@ -50,15 +50,11 @@ using std::isfinite; using std::isnan; using std::log; using std::exp; -using std::hypot; using std::sin; using std::cos; using std::sinh; -using std::asinh; using std::asin; using std::acos; -using std::asinh; -using std::acosh; using std::tan; using std::atan; using std::atan2; @@ -67,6 +63,11 @@ using std::sqrt; using std::pow; using std::floor; using std::ceil; +#ifndef ANDROID +using std::hypot; +using std::asinh; +using std::acosh; +#endif // genus (in grammar) #define GEN_M 0 diff --git a/hyperroid/app/src/main/jni/hyper.cpp b/hyperroid/app/src/main/jni/hyper.cpp index 08cf2257..eeb8254c 100644 --- a/hyperroid/app/src/main/jni/hyper.cpp +++ b/hyperroid/app/src/main/jni/hyper.cpp @@ -21,6 +21,7 @@ #define CAP_SHADER 1 #define CAP_VERTEXBUFFER 0 #define CAP_TIMEOFDAY 1 +#define NO_STD_HYPOT #define HNEW 1