diff options
| author | Stephen Hines <srhines@google.com> | 2011-12-06 18:33:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-06 18:33:35 -0800 |
| commit | f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d (patch) | |
| tree | bd66a9ecbfb1efac52d1b0388356b552d9b01ae2 | |
| parent | 2b621bc5bb52339cc677beb89d0495b8b5d4f444 (diff) | |
| parent | 4d322043ab695583a6741924b60c934fd9dc7e3e (diff) | |
| download | frameworks_base-f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d.zip frameworks_base-f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d.tar.gz frameworks_base-f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d.tar.bz2 | |
Merge "NULL should not be const for 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 e9c3c5e..84bca9c 100644 --- a/libs/rs/scriptc/rs_types.rsh +++ b/libs/rs/scriptc/rs_types.rsh @@ -364,7 +364,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)) |