Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit af661e836039cbc2aadb3bccfd7d3ddfc1bcc456

Authored by Rashika Kheria
Committed by Linus Torvalds
1 parent 3c516cdd02
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

lib/decompress_inflate.c: include appropriate header file 

Include appropriate header file include/linux/decompress/inflate.h in
lib/decompress_inflate.c because it has prototype declaration of
function defined in lib/decompress_inflate.c.

Also, fix the guard around the header file
include/linux/decompress/inflate.h to use a more unique guard symbol.
This avoids conflict with the INFLATE_H defined by
zlib_inflate/inflate.h.

This eliminates the following warning in lib/decompress_inflate.c:

  lib/decompress_inflate.c:35:17: warning: no previous prototype for `gunzip' [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

include/linux/decompress/inflate.h
Diff comments   View file @ af661e8
1   -#ifndef INFLATE_H
2   -#define INFLATE_H
  1 +#ifndef LINUX_DECOMPRESS_INFLATE_H
  2 +#define LINUX_DECOMPRESS_INFLATE_H
3 3  
4 4 int gunzip(unsigned char *inbuf, int len,
5 5 int(*fill)(void*, unsigned int),
lib/decompress_inflate.c
Diff comments   View file @ af661e8
... ... @@ -19,6 +19,7 @@
19 19 #include "zlib_inflate/inflate.h"
20 20  
21 21 #include "zlib_inflate/infutil.h"
  22 +#include <linux/decompress/inflate.h>
22 23  
23 24 #endif /* STATIC */
24 25