summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRashika Kheria <rashika.kheria@gmail.com>2014-04-03 14:49:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 16:21:12 -0700
commitaf661e836039cbc2aadb3bccfd7d3ddfc1bcc456 (patch)
treef962029aca6c1e29ce7a0b634e674aff4c289eb4
parent3c516cdd02633bda90759ea227e6abb003f8c20a (diff)
downloadop-kernel-dev-af661e836039cbc2aadb3bccfd7d3ddfc1bcc456.zip
op-kernel-dev-af661e836039cbc2aadb3bccfd7d3ddfc1bcc456.tar.gz
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>
-rw-r--r--include/linux/decompress/inflate.h4
-rw-r--r--lib/decompress_inflate.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/decompress/inflate.h b/include/linux/decompress/inflate.h
index 8c0aef1..1d0aede 100644
--- a/include/linux/decompress/inflate.h
+++ b/include/linux/decompress/inflate.h
@@ -1,5 +1,5 @@
-#ifndef INFLATE_H
-#define INFLATE_H
+#ifndef LINUX_DECOMPRESS_INFLATE_H
+#define LINUX_DECOMPRESS_INFLATE_H
int gunzip(unsigned char *inbuf, int len,
int(*fill)(void*, unsigned int),
diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c
index d619b28..0edfd74 100644
--- a/lib/decompress_inflate.c
+++ b/lib/decompress_inflate.c
@@ -19,6 +19,7 @@
#include "zlib_inflate/inflate.h"
#include "zlib_inflate/infutil.h"
+#include <linux/decompress/inflate.h>
#endif /* STATIC */
OpenPOWER on IntegriCloud