summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-10-28 13:55:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-28 13:55:14 -0700
commit858b93c0fd24f9ee5158247e1deedaf8b239a941 (patch)
treebad1853da59d50bf71bf683057dea7aa0d7703a5 /libs/rs
parent61b39a48bcf961999578c75f8b712b3ba0dfc70e (diff)
parent420a5fbbd58d6a0b4ee38948410be9d83b007e07 (diff)
downloadframeworks_base-858b93c0fd24f9ee5158247e1deedaf8b239a941.zip
frameworks_base-858b93c0fd24f9ee5158247e1deedaf8b239a941.tar.gz
frameworks_base-858b93c0fd24f9ee5158247e1deedaf8b239a941.tar.bz2
Merge "Fix 3140348: Signature was wrong for atan2() in RS."
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/rsScriptC_LibCL.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsScriptC_LibCL.cpp b/libs/rs/rsScriptC_LibCL.cpp
index ce8e7b2..1b1a752 100644
--- a/libs/rs/rsScriptC_LibCL.cpp
+++ b/libs/rs/rsScriptC_LibCL.cpp
@@ -205,9 +205,9 @@ static ScriptCState::SymbolTable_t gSyms[] = {
{ "_Z5asinhf", (void *)&asinhf },
{ "_Z6asinpif", (void *)&SC_asinpi },
{ "_Z4atanf", (void *)&atanf },
- { "_Z5atan2f", (void *)&atan2f },
+ { "_Z5atan2ff", (void *)&atan2f },
{ "_Z6atanpif", (void *)&SC_atanpi },
- { "_Z7atan2pif", (void *)&SC_atan2pi },
+ { "_Z7atan2piff", (void *)&SC_atan2pi },
{ "_Z4cbrtf", (void *)&cbrtf },
{ "_Z4ceilf", (void *)&ceilf },
{ "_Z8copysignff", (void *)&copysignf },