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 | |
parent | 0e2286f226c8ce66adb846995eb1bf0b4d92a649 (diff) | |
download | rockbox-87409a2619957e8756fa5ba47f9f67baec7ead82.tar.gz rockbox-87409a2619957e8756fa5ba47f9f67baec7ead82.zip |
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
-rw-r--r-- | apps/codecs/libmusepack/mpc_types.h | 2 | ||||
-rw-r--r-- | apps/codecs/libspeex/config-speex.h | 2 | ||||
-rw-r--r-- | firmware/common/memset16.c | 3 | ||||
-rw-r--r-- | firmware/drivers/lcd-16bit-vert.c | 3 | ||||
-rw-r--r-- | firmware/drivers/lcd-16bit.c | 3 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-vi.c | 3 | ||||
-rw-r--r-- | firmware/include/memset16.h (renamed from firmware/include/memory.h) | 11 | ||||
-rw-r--r-- | firmware/include/string-extra.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | 2 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/kernel-sdl.c | 2 | ||||
-rw-r--r-- | flash/extract/extract.c | 4 | ||||
-rw-r--r-- | flash/make_firmware/make_firmware.c | 2 |
13 files changed, 18 insertions, 22 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 @@ | |||
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #include <stdlib.h> | 40 | #include <stdlib.h> |
41 | #include <memory.h> | 41 | #include <inttypes.h> |
42 | 42 | ||
43 | #ifdef __cplusplus | 43 | #ifdef __cplusplus |
44 | extern "C" { | 44 | 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 @@ | |||
74 | /* #undef HAVE_LIBWINMM */ | 74 | /* #undef HAVE_LIBWINMM */ |
75 | 75 | ||
76 | /* Define to 1 if you have the <memory.h> header file. */ | 76 | /* Define to 1 if you have the <memory.h> header file. */ |
77 | #define HAVE_MEMORY_H 1 | 77 | /* #define HAVE_MEMORY_H 1 */ |
78 | 78 | ||
79 | /* Define to 1 if you have the <stdint.h> header file. */ | 79 | /* Define to 1 if you have the <stdint.h> header file. */ |
80 | #define HAVE_STDINT_H 1 | 80 | #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 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include <string.h> | 22 | #include "string-extra.h" /* memset16() */ |
23 | #include "memory.h" | ||
24 | 23 | ||
25 | #define LBLOCKSIZE (sizeof(long)/2) | 24 | #define LBLOCKSIZE (sizeof(long)/2) |
26 | #define UNALIGNED(X) ((long)X & (sizeof(long) - 1)) | 25 | #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 @@ | |||
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | #include "kernel.h" | 28 | #include "kernel.h" |
29 | #include "thread.h" | 29 | #include "thread.h" |
30 | #include <string.h> | ||
31 | #include <stdlib.h> | 30 | #include <stdlib.h> |
32 | #include "memory.h" | 31 | #include "string-extra.h" /* mem*() */ |
33 | #include "file.h" | 32 | #include "file.h" |
34 | #include "debug.h" | 33 | #include "debug.h" |
35 | #include "system.h" | 34 | #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 @@ | |||
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | #include "kernel.h" | 27 | #include "kernel.h" |
28 | #include "thread.h" | 28 | #include "thread.h" |
29 | #include <string.h> | ||
30 | #include <stdlib.h> | 29 | #include <stdlib.h> |
31 | #include "memory.h" | 30 | #include "string-extra.h" /* mem*() */ |
32 | #include "file.h" | 31 | #include "file.h" |
33 | #include "debug.h" | 32 | #include "debug.h" |
34 | #include "system.h" | 33 | #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 @@ | |||
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | #include "kernel.h" | 27 | #include "kernel.h" |
28 | #include "thread.h" | 28 | #include "thread.h" |
29 | #include <string.h> | ||
30 | #include <stdlib.h> | 29 | #include <stdlib.h> |
31 | #include "memory.h" | 30 | #include "string-extra.h" /* mem*() */ |
32 | #include "file.h" | 31 | #include "file.h" |
33 | #include "debug.h" | 32 | #include "debug.h" |
34 | #include "system.h" | 33 | #include "system.h" |
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 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #ifndef _MEMORY_H_ | 22 | #ifndef __MEMSET16_H__ |
23 | #define _MEMORY_H_ | 23 | #define __MEMSET16_H__ |
24 | 24 | ||
25 | #include "inttypes.h" | 25 | #include <string.h> /* size_t */ |
26 | extern void memset16(void *dst, int val, size_t len); | ||
26 | 27 | ||
27 | void memset16(void *dst, int val, size_t len); | 28 | #endif /* __MEMSET16_H__ */ |
28 | |||
29 | #endif /* _MEMORY_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 @@ | |||
26 | #include "strcasecmp.h" | 26 | #include "strcasecmp.h" |
27 | #include "strcasestr.h" | 27 | #include "strcasestr.h" |
28 | #include "strtok_r.h" | 28 | #include "strtok_r.h" |
29 | #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 @@ | |||
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | #include "system.h" | 27 | #include "system.h" |
28 | #include "memory.h" | 28 | #include "string-extra.h" /* memset16() */ |
29 | #include "cpu.h" | 29 | #include "cpu.h" |
30 | #include "spi.h" | 30 | #include "spi.h" |
31 | #include "spi-target.h" | 31 | #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 @@ | |||
27 | #include "cpu.h" | 27 | #include "cpu.h" |
28 | #include "string.h" | 28 | #include "string.h" |
29 | #include "kernel.h" | 29 | #include "kernel.h" |
30 | #include "memory.h" | 30 | #include "string-extra.h" /* memset16() */ |
31 | #include "mmu-arm.h" | 31 | #include "mmu-arm.h" |
32 | #include "system-target.h" | 32 | #include "system-target.h" |
33 | #include "lcd.h" | 33 | #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 @@ | |||
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <SDL.h> | 24 | #include <SDL.h> |
25 | #include <SDL_thread.h> | 25 | #include <SDL_thread.h> |
26 | #include "memory.h" | 26 | #include <inttypes.h> |
27 | #include "system-sdl.h" | 27 | #include "system-sdl.h" |
28 | #include "thread-sdl.h" | 28 | #include "thread-sdl.h" |
29 | #include "kernel.h" | 29 | #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 @@ | |||
23 | 23 | ||
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | #include <memory.h> | 26 | #include <inttypes.h> |
27 | 27 | ||
28 | #define UINT8 unsigned char | 28 | #define UINT8 unsigned char |
29 | #define UINT16 unsigned short | 29 | #define UINT16 unsigned short |
@@ -144,4 +144,4 @@ int main(int argc, char* argv[]) | |||
144 | fclose(pOutFile); | 144 | fclose(pOutFile); |
145 | 145 | ||
146 | return 0; | 146 | return 0; |
147 | } \ No newline at end of file | 147 | } |
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 @@ | |||
25 | 25 | ||
26 | #include <stdio.h> | 26 | #include <stdio.h> |
27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
28 | #include <memory.h> | 28 | #include <inttypes.h> |
29 | #include <string.h> | 29 | #include <string.h> |
30 | 30 | ||
31 | #define UINT8 unsigned char | 31 | #define UINT8 unsigned char |