diff options
| author | Stephen Hines <srhines@google.com> | 2011-12-06 18:34:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-06 18:34:54 -0800 |
| commit | 5912157f97092d11af687bea88bd71dd13fd9e78 (patch) | |
| tree | 630d5b4ec57ef456063ac81e09658f82ed6b9a98 /libs/rs | |
| parent | d11b88dc91cd0e2668141e2c13edf19b2f0f470c (diff) | |
| parent | f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d (diff) | |
| download | frameworks_base-5912157f97092d11af687bea88bd71dd13fd9e78.zip frameworks_base-5912157f97092d11af687bea88bd71dd13fd9e78.tar.gz frameworks_base-5912157f97092d11af687bea88bd71dd13fd9e78.tar.bz2 | |
am f7f93048: Merge "NULL should not be const for RS."
* commit 'f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d':
NULL should not be const for RS.
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/scriptc/rs_types.rsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/scriptc/rs_types.rsh b/libs/rs/scriptc/rs_types.rsh index 28b7bf5..a01807e 100644 --- a/libs/rs/scriptc/rs_types.rsh +++ b/libs/rs/scriptc/rs_types.rsh @@ -370,7 +370,7 @@ typedef struct { typedef float4 rs_quaternion; #define RS_PACKED __attribute__((packed, aligned(4))) -#define NULL ((const void *)0) +#define NULL ((void *)0) #if (defined(RS_VERSION) && (RS_VERSION >= 14)) |