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
This commit is contained in:
parent
0e2286f226
commit
87409a2619
|
@ -38,7 +38,7 @@
|
|||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <memory.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -19,8 +19,7 @@
|
|||
*
|
||||
****************************************************************************/
|
||||
|
||||
#include <string.h>
|
||||
#include "memory.h"
|
||||
#include "string-extra.h" /* memset16() */
|
||||
|
||||
#define LBLOCKSIZE (sizeof(long)/2)
|
||||
#define UNALIGNED(X) ((long)X & (sizeof(long) - 1))
|
||||
|
|
|
@ -27,9 +27,8 @@
|
|||
#include "lcd.h"
|
||||
#include "kernel.h"
|
||||
#include "thread.h"
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include "memory.h"
|
||||
#include "string-extra.h" /* mem*() */
|
||||
#include "file.h"
|
||||
#include "debug.h"
|
||||
#include "system.h"
|
||||
|
|
|
@ -26,9 +26,8 @@
|
|||
#include "lcd.h"
|
||||
#include "kernel.h"
|
||||
#include "thread.h"
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include "memory.h"
|
||||
#include "string-extra.h" /* mem*() */
|
||||
#include "file.h"
|
||||
#include "debug.h"
|
||||
#include "system.h"
|
||||
|
|
|
@ -26,9 +26,8 @@
|
|||
#include "lcd.h"
|
||||
#include "kernel.h"
|
||||
#include "thread.h"
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include "memory.h"
|
||||
#include "string-extra.h" /* mem*() */
|
||||
#include "file.h"
|
||||
#include "debug.h"
|
||||
#include "system.h"
|
||||
|
|
|
@ -19,11 +19,10 @@
|
|||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef _MEMORY_H_
|
||||
#define _MEMORY_H_
|
||||
#ifndef __MEMSET16_H__
|
||||
#define __MEMSET16_H__
|
||||
|
||||
#include "inttypes.h"
|
||||
#include <string.h> /* 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__ */
|
|
@ -26,3 +26,4 @@
|
|||
#include "strcasecmp.h"
|
||||
#include "strcasestr.h"
|
||||
#include "strtok_r.h"
|
||||
#include "memset16.h"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <stdio.h>
|
||||
#include <SDL.h>
|
||||
#include <SDL_thread.h>
|
||||
#include "memory.h"
|
||||
#include <inttypes.h>
|
||||
#include "system-sdl.h"
|
||||
#include "thread-sdl.h"
|
||||
#include "kernel.h"
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <memory.h>
|
||||
#include <inttypes.h>
|
||||
#include <string.h>
|
||||
|
||||
#define UINT8 unsigned char
|
||||
|
|
Loading…
Reference in New Issue