diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-08-12 13:55:01 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-12 13:55:01 +0000 |
| commit | 87409a2619957e8756fa5ba47f9f67baec7ead82 (patch) | |
| tree | 2f142b8b24dbc496db1007f20f2d695a8848ea6c /firmware/include | |
| parent | 0e2286f226c8ce66adb846995eb1bf0b4d92a649 (diff) | |
Move memset6() declaration to string-extra.h, kills a warning compiling for android since it ships a memory.h.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27789 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/include')
| -rw-r--r-- | firmware/include/memset16.h (renamed from firmware/include/memory.h) | 11 | ||||
| -rw-r--r-- | firmware/include/string-extra.h | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/firmware/include/memory.h b/firmware/include/memset16.h index 105d0280b2..1569644db5 100644 --- a/firmware/include/memory.h +++ b/firmware/include/memset16.h @@ -19,11 +19,10 @@ * ****************************************************************************/ -#ifndef _MEMORY_H_ -#define _MEMORY_H_ +#ifndef __MEMSET16_H__ +#define __MEMSET16_H__ -#include "inttypes.h" +#include <string.h> /* size_t */ +extern void memset16(void *dst, int val, size_t len); -void memset16(void *dst, int val, size_t len); - -#endif /* _MEMORY_H_ */ +#endif /* __MEMSET16_H__ */ diff --git a/firmware/include/string-extra.h b/firmware/include/string-extra.h index 16dd2fdccf..bae250d7c9 100644 --- a/firmware/include/string-extra.h +++ b/firmware/include/string-extra.h @@ -26,3 +26,4 @@ #include "strcasecmp.h" #include "strcasestr.h" #include "strtok_r.h" +#include "memset16.h" |