diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-02 23:54:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-02 23:54:37 +0000 |
| commit | adc10102492a3d46478d6687a3cfcc4d6488c1fb (patch) | |
| tree | a6b8edaa032a2ce52e22ed3692e7303ac4c63ceb /include | |
| parent | f7f8f15bfbbc49342fe4258833ae56bf8cf5cb5b (diff) | |
| parent | 4c1d4a0e8ec344799813ce5e6642946839e0036a (diff) | |
| download | system_core-adc10102492a3d46478d6687a3cfcc4d6488c1fb.zip system_core-adc10102492a3d46478d6687a3cfcc4d6488c1fb.tar.gz system_core-adc10102492a3d46478d6687a3cfcc4d6488c1fb.tar.bz2 | |
am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
* commit '4c1d4a0e8ec344799813ce5e6642946839e0036a':
Be more intention-revealing with libcutils' strlcpy.
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/cutils/memory.h b/include/cutils/memory.h index e725cdd..4d26882 100644 --- a/include/cutils/memory.h +++ b/include/cutils/memory.h @@ -30,7 +30,7 @@ void android_memset16(uint16_t* dst, uint16_t value, size_t size); /* size is given in bytes and must be multiple of 4 */ void android_memset32(uint32_t* dst, uint32_t value, size_t size); -#if !HAVE_STRLCPY +#if defined(__GLIBC__) || defined(_WIN32) /* Declaration of strlcpy() for platforms that don't already have it. */ size_t strlcpy(char *dst, const char *src, size_t size); #endif |