wok diff syslinux/stuff/extra/loadhigh.u @ rev 18798

amule: update deps (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Jan 09 18:56:52 2016 +0100 (2016-01-09)
parents 924e6ea5da10
children 8ebcb0ded385
line diff
     1.1 --- a/syslinux/stuff/extra/loadhigh.u	Tue Dec 29 10:21:19 2015 +0100
     1.2 +++ b/syslinux/stuff/extra/loadhigh.u	Sat Jan 09 18:56:52 2016 +0100
     1.3 @@ -44,7 +44,7 @@
     1.4  +	break;
     1.5  +    case 0x2204:
     1.6  +    case 0x2102:
     1.7 -+	buf = unlz4((unsigned char *) unpacked, (unsigned char *) buf);
     1.8 ++	buf = (char *) unlz4((unsigned char *) unpacked, (unsigned char *) buf);
     1.9  +	break;
    1.10  +    }
    1.11  +#endif
    1.12 @@ -53,7 +53,7 @@
    1.13       if (pad)
    1.14  --- /dev/null
    1.15  +++ core/unlzma.c
    1.16 -@@ -0,0 +1,383 @@
    1.17 +@@ -0,0 +1,385 @@
    1.18  +typedef unsigned char uint8_t;
    1.19  +typedef unsigned short uint16_t;
    1.20  +typedef unsigned uint32_t;
    1.21 @@ -72,6 +72,8 @@
    1.22  + * Licensed under GPLv2 or later, see file LICENSE in this source tree.
    1.23  + */
    1.24  +
    1.25 ++#include <string.h>
    1.26 ++
    1.27  +#define PACKED __attribute__ ((packed))
    1.28  +#define ALWAYS_INLINE inline
    1.29  +#define speed_inline
    1.30 @@ -439,7 +441,7 @@
    1.31  +}
    1.32  --- /dev/null
    1.33  +++ core/unlz4.c
    1.34 -@@ -0,0 +1,112 @@
    1.35 +@@ -0,0 +1,114 @@
    1.36  +/*
    1.37  + * Copyright (C) 2015, pascal.bellard@slitaz.org
    1.38  + *
    1.39 @@ -448,6 +450,8 @@
    1.40  + * published by the Free Software Foundation.
    1.41  + */
    1.42  +
    1.43 ++#include <string.h>
    1.44 ++
    1.45  +#define LZ4_MAGIC	0x184D2204	/* Spec 1.5.0 */
    1.46  +#define LZ4_LEGACY	0x184C2102
    1.47  +#define LZ4_SKIP(n)	((((n) - 0x184D2A50) >> 4) == 0)
    1.48 @@ -463,7 +467,7 @@
    1.49  +	return n;
    1.50  +}
    1.51  +
    1.52 -+char *unlz4(unsigned char *from, unsigned char *end)
    1.53 ++unsigned char *unlz4(unsigned char *from, unsigned char *end)
    1.54  +{
    1.55  +	unsigned char *p, *end_chunk, *to, flags, mask;
    1.56  +	long magic;