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 /apps/codecs | |
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 'apps/codecs')
-rw-r--r-- | apps/codecs/libmusepack/mpc_types.h | 2 | ||||
-rw-r--r-- | apps/codecs/libspeex/config-speex.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/codecs/libmusepack/mpc_types.h b/apps/codecs/libmusepack/mpc_types.h index 61ee5ea67f..aa25f3df99 100644 --- a/apps/codecs/libmusepack/mpc_types.h +++ b/apps/codecs/libmusepack/mpc_types.h @@ -38,7 +38,7 @@ #endif #include <stdlib.h> -#include <memory.h> +#include <inttypes.h> #ifdef __cplusplus extern "C" { diff --git a/apps/codecs/libspeex/config-speex.h b/apps/codecs/libspeex/config-speex.h index f3b397f541..7e0672c150 100644 --- a/apps/codecs/libspeex/config-speex.h +++ b/apps/codecs/libspeex/config-speex.h @@ -74,7 +74,7 @@ /* #undef HAVE_LIBWINMM */ /* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 +/* #define HAVE_MEMORY_H 1 */ /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 |