Author: stepan Date: Wed Apr 21 14:55:47 2010 New Revision: 130 URL: http://tracker.coreboot.org/trac/filo/changeset/130
Log: fix cramfs compilation
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/filo/fs/fsys_cramfs.c trunk/filo/fs/mini_inflate.c trunk/filo/fs/mini_inflate.h
Modified: trunk/filo/fs/fsys_cramfs.c ============================================================================== --- trunk/filo/fs/fsys_cramfs.c Tue Apr 20 19:49:01 2010 (r129) +++ trunk/filo/fs/fsys_cramfs.c Wed Apr 21 14:55:47 2010 (r130) @@ -117,8 +117,8 @@ #define CRAMFS_ROOT_INO (sizeof(struct cramfs_super) - sizeof(struct cramfs_inode))
#ifndef STAGE1_5 -#define cramfs_memcmp grub_memcmp -#define cramfs_strlen grub_strlen +#define cramfs_memcmp memcmp +#define cramfs_strlen strlen #else int cramfs_memcmp (const char *s1, const char *s2, int n)
Modified: trunk/filo/fs/mini_inflate.c ============================================================================== --- trunk/filo/fs/mini_inflate.c Tue Apr 20 19:49:01 2010 (r129) +++ trunk/filo/fs/mini_inflate.c Wed Apr 21 14:55:47 2010 (r130) @@ -29,7 +29,7 @@ static unsigned char huffman_order[] = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; -inline void cramfs_memset(int *s, const int c, size n) +inline void cramfs_memset(int *s, const int c, size_t n) { n--; for (;n > 0; n--) s[n] = c;
Modified: trunk/filo/fs/mini_inflate.h ============================================================================== --- trunk/filo/fs/mini_inflate.h Tue Apr 20 19:49:01 2010 (r129) +++ trunk/filo/fs/mini_inflate.h Wed Apr 21 14:55:47 2010 (r130) @@ -23,8 +23,6 @@ * */
-typedef __SIZE_TYPE__ size; - #define NO_ERROR 0 #define COMP_UNKNOWN 1 /* The specififed bytype is invalid */ #define CODE_NOT_FOUND 2 /* a huffman code in the stream could not be decoded */