From 87409a2619957e8756fa5ba47f9f67baec7ead82 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 12 Aug 2010 13:55:01 +0000 Subject: [PATCH] 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 --- apps/codecs/libmusepack/mpc_types.h | 2 +- apps/codecs/libspeex/config-speex.h | 2 +- firmware/common/memset16.c | 3 +-- firmware/drivers/lcd-16bit-vert.c | 3 +-- firmware/drivers/lcd-16bit.c | 3 +-- firmware/drivers/lcd-2bit-vi.c | 3 +-- firmware/include/{memory.h => memset16.h} | 11 +++++------ firmware/include/string-extra.h | 1 + .../arm/tms320dm320/creative-zvm/lcd-creativezvm.c | 2 +- firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | 2 +- firmware/target/hosted/sdl/kernel-sdl.c | 2 +- flash/extract/extract.c | 4 ++-- flash/make_firmware/make_firmware.c | 2 +- 13 files changed, 18 insertions(+), 22 deletions(-) rename firmware/include/{memory.h => memset16.h} (85%) 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 -#include +#include #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 header file. */ -#define HAVE_MEMORY_H 1 +/* #define HAVE_MEMORY_H 1 */ /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 diff --git a/firmware/common/memset16.c b/firmware/common/memset16.c index c90e2d7340..7e31df0cdd 100644 --- a/firmware/common/memset16.c +++ b/firmware/common/memset16.c @@ -19,8 +19,7 @@ * ****************************************************************************/ -#include -#include "memory.h" +#include "string-extra.h" /* memset16() */ #define LBLOCKSIZE (sizeof(long)/2) #define UNALIGNED(X) ((long)X & (sizeof(long) - 1)) diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c index 2b4faef4a1..a2f47d3544 100644 --- a/firmware/drivers/lcd-16bit-vert.c +++ b/firmware/drivers/lcd-16bit-vert.c @@ -27,9 +27,8 @@ #include "lcd.h" #include "kernel.h" #include "thread.h" -#include #include -#include "memory.h" +#include "string-extra.h" /* mem*() */ #include "file.h" #include "debug.h" #include "system.h" diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index f8b4272f7c..be4f21f412 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c @@ -26,9 +26,8 @@ #include "lcd.h" #include "kernel.h" #include "thread.h" -#include #include -#include "memory.h" +#include "string-extra.h" /* mem*() */ #include "file.h" #include "debug.h" #include "system.h" diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c index 5dd94a15a0..697d1a7783 100644 --- a/firmware/drivers/lcd-2bit-vi.c +++ b/firmware/drivers/lcd-2bit-vi.c @@ -26,9 +26,8 @@ #include "lcd.h" #include "kernel.h" #include "thread.h" -#include #include -#include "memory.h" +#include "string-extra.h" /* mem*() */ #include "file.h" #include "debug.h" #include "system.h" diff --git a/firmware/include/memory.h b/firmware/include/memset16.h similarity index 85% rename from firmware/include/memory.h rename to 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 /* 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" diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c index b11c9f0fd5..c92920337b 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c @@ -25,7 +25,7 @@ #include "kernel.h" #include "lcd.h" #include "system.h" -#include "memory.h" +#include "string-extra.h" /* memset16() */ #include "cpu.h" #include "spi.h" #include "spi-target.h" diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c index 3d65bcc092..838efa4cd3 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c @@ -27,7 +27,7 @@ #include "cpu.h" #include "string.h" #include "kernel.h" -#include "memory.h" +#include "string-extra.h" /* memset16() */ #include "mmu-arm.h" #include "system-target.h" #include "lcd.h" diff --git a/firmware/target/hosted/sdl/kernel-sdl.c b/firmware/target/hosted/sdl/kernel-sdl.c index d796921e35..c4d4ee220e 100644 --- a/firmware/target/hosted/sdl/kernel-sdl.c +++ b/firmware/target/hosted/sdl/kernel-sdl.c @@ -23,7 +23,7 @@ #include #include #include -#include "memory.h" +#include #include "system-sdl.h" #include "thread-sdl.h" #include "kernel.h" diff --git a/flash/extract/extract.c b/flash/extract/extract.c index e6ea2efdc1..b1f8f4d870 100644 --- a/flash/extract/extract.c +++ b/flash/extract/extract.c @@ -23,7 +23,7 @@ #include #include -#include +#include #define UINT8 unsigned char #define UINT16 unsigned short @@ -144,4 +144,4 @@ int main(int argc, char* argv[]) fclose(pOutFile); return 0; -} \ No newline at end of file +} diff --git a/flash/make_firmware/make_firmware.c b/flash/make_firmware/make_firmware.c index 9b5b55f8de..a79f2b970d 100644 --- a/flash/make_firmware/make_firmware.c +++ b/flash/make_firmware/make_firmware.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #define UINT8 unsigned char