diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-07 15:03:46 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-07 15:14:02 -0800 |
| commit | dc9c109af815100d497184e6dadebceed7f3bf1d (patch) | |
| tree | 51bb2aa4ff78b0ebcdbe1cc474c76dd2d38d7a37 /include | |
| parent | 9a0aa553ad9f6657cbbf0a182566c481e191e6b7 (diff) | |
| parent | 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b (diff) | |
| download | frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.zip frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.tar.gz frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.tar.bz2 | |
resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
Diffstat (limited to 'include')
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 6b84494..03b7f4a 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -247,8 +247,8 @@ enum { #define Res_MAKEINTERNAL(entry) (0x01000000 | (entry&0xFFFF)) #define Res_MAKEARRAY(entry) (0x02000000 | (entry&0xFFFF)) -#define Res_MAXPACKAGE 255 -#define Res_MAXTYPE 255 +static const size_t Res_MAXPACKAGE = 255; +static const size_t Res_MAXTYPE = 255; /** * Representation of a value in a resource, supplying type |