diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-03 18:03:53 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-11-03 18:06:22 -0800 |
| commit | 3fd340028fc24198edb23ddf5eb5a0a100bab745 (patch) | |
| tree | 489ffeed9998280d7402b74ed78bcc61d6cd8872 /tools/aapt/StringPool.h | |
| parent | 7fd12db350a341eb7a50759aa329be5281556928 (diff) | |
| parent | 78be0498af2b7d5b6855701ef316f488e2de6f14 (diff) | |
Merge commit '78be0498' into manualmerge
Conflicts:
libs/androidfw/ResourceTypes.cpp
tools/aapt/Android.mk
tools/aapt/StringPool.cpp
tools/aapt/StringPool.h
Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
Diffstat (limited to 'tools/aapt/StringPool.h')
| -rw-r--r-- | tools/aapt/StringPool.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/aapt/StringPool.h b/tools/aapt/StringPool.h index 0b2653845b02..dbe8c8542185 100644 --- a/tools/aapt/StringPool.h +++ b/tools/aapt/StringPool.h @@ -26,7 +26,10 @@ using namespace android; #define PRINT_STRING_METRICS 0 +#if __cplusplus >= 201103L void strcpy16_htod(char16_t* dst, const char16_t* src); +#endif +void strcpy16_htod(uint16_t* dst, const char16_t* src); void printStringPool(const ResStringPool* pool); |