GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-27 09:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs/jffs2/mini_inflate.c: use "static inline" instead of "inline"

Browse source 
This makes gcc no longer expect an out-of-line version of the
functions being present elsewhere.

This fixes a failure to build on several marvell targets with gcc-7 on
Debian:

  https://bugs.debian.org/877963

Signed-off-by: Adrian Bunk <bunk@debian.org>
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
This commit is contained in:
Vagrant Cascadian 2017-10-10 09:42:39 -07:00 • committed by Tom Rini
parent 41ba7f525f
commit c005f7edbb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fs/jffs2/mini_inflate.c
View file

@ -16,7 +16,7 @@
static unsigned char huffman_order[] = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, static unsigned char huffman_order[] = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5,
11, 4, 12, 3, 13, 2, 14, 1, 15}; 11, 4, 12, 3, 13, 2, 14, 1, 15};
inline void cramfs_memset(int *s, const int c, size n) static inline void cramfs_memset(int *s, const int c, size n)
{ {
n--; n--;
for (;n > 0; n--) s[n] = c; for (;n > 0; n--) s[n] = c;
@ -65,8 +65,8 @@ static void init_stream(struct bitstream *stream, unsigned char *data,
/* pull 'bits' bits out of the stream. The last bit pulled it returned as the /* pull 'bits' bits out of the stream. The last bit pulled it returned as the
* msb. (section 3.1.1) * msb. (section 3.1.1)
*/ */
inline unsigned long pull_bits(struct bitstream *stream, static inline unsigned long pull_bits(struct bitstream *stream,
const unsigned int bits) const unsigned int bits)
{ {
unsigned long ret; unsigned long ret;
int i; int i;
@ -85,7 +85,7 @@ inline unsigned long pull_bits(struct bitstream *stream,
return ret; return ret;
} }
inline int pull_bit(struct bitstream *stream) static inline int pull_bit(struct bitstream *stream)
{ {
int ret = ((*(stream->data) >> stream->bit) & 1); int ret = ((*(stream->data) >> stream->bit) & 1);
if (stream->bit++ == 7) { if (stream->bit++ == 7) {