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 /flash | |
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
Diffstat (limited to 'flash')
-rw-r--r-- | flash/extract/extract.c | 4 | ||||
-rw-r--r-- | flash/make_firmware/make_firmware.c | 2 |
2 files changed, 3 insertions, 3 deletions
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 <stdio.h> #include <stdlib.h> -#include <memory.h> +#include <inttypes.h> #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 <stdio.h> #include <stdlib.h> -#include <memory.h> +#include <inttypes.h> #include <string.h> #define UINT8 unsigned char |