From 87409a2619957e8756fa5ba47f9f67baec7ead82 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 12 Aug 2010 13:55:01 +0000 Subject: 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 --- firmware/drivers/lcd-16bit-vert.c | 3 +-- firmware/drivers/lcd-16bit.c | 3 +-- firmware/drivers/lcd-2bit-vi.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'firmware/drivers') 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" -- cgit v1.2.3