diff options
| author | Bill Yi <byi@google.com> | 2014-10-22 08:47:27 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2014-10-22 08:47:27 -0700 |
| commit | c10c49404a35384be5fe44bd04b6eed1ffc6a98c (patch) | |
| tree | aadd217173b2672809697cb0e48235716c23d182 /cpp/RenderScript.cpp | |
| parent | b4d28c50d522e9e396b6aad7cf63debe51fd00a3 (diff) | |
| parent | 6a95b944f23e7c6a8fc3a6fe42350df4fad7d27d (diff) | |
Merge commit '6a95b944f23e7c6a8fc3a6fe42350df4fad7d27d' into HEAD
Diffstat (limited to 'cpp/RenderScript.cpp')
| -rw-r--r-- | cpp/RenderScript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/RenderScript.cpp b/cpp/RenderScript.cpp index 27cb3e83..e2fd651e 100644 --- a/cpp/RenderScript.cpp +++ b/cpp/RenderScript.cpp @@ -432,7 +432,7 @@ static bool loadSO(const char* filename) { } static uint32_t getProp(const char *str) { -#if !defined(RS_SERVER) && defined(HAVE_ANDROID_OS) +#if !defined(__LP64__) && !defined(RS_SERVER) && defined(HAVE_ANDROID_OS) char buf[256]; property_get(str, buf, "0"); return atoi(buf); |