diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2010-11-17 11:32:47 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2010-11-17 11:32:47 +0200 |
| commit | f3f51456e975989b78bcf4dabb48fc89c7a6236e (patch) | |
| tree | 33c0d7d911b38d5c4757bfe4d90ee0ed0e35b99c /linux/lib | |
| parent | f1fbad3bbf3a7bfe510c5e89265aa6475c2c2c61 (diff) | |
| download | xz-embedded-f3f51456e975989b78bcf4dabb48fc89c7a6236e.tar.gz | |
Don't make memmove() static.
This hack is to avoid a conflict with the memmove()
prototype in the Linux headers.
Diffstat (limited to 'linux/lib')
| -rw-r--r-- | linux/lib/decompress_unxz.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/lib/decompress_unxz.c b/linux/lib/decompress_unxz.c index 3b92866..6c8a47f 100644 --- a/linux/lib/decompress_unxz.c +++ b/linux/lib/decompress_unxz.c @@ -208,7 +208,8 @@ static void XZ_FUNC memzero(void *buf, size_t size) #endif #ifndef memmove -static void * XZ_FUNC memmove(void *dest, const void *src, size_t size) +/* Not static to avoid a conflict with the prototype in the Linux headers. */ +void * XZ_FUNC memmove(void *dest, const void *src, size_t size) { uint8_t *d = dest; const uint8_t *s = src; |