diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-06 11:43:24 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-02-09 09:37:07 +0100 |
commit | 359966df3721803a1e0873c98182e7280029b068 (patch) | |
tree | 1fb3ac85fc65dd73db5c683a6a3b9c7d5b835255 /scripts/compiler.h | |
parent | 2b3659b9648b26b485f13428bb3d3ccaf3517465 (diff) | |
download | barebox-359966df3721803a1e0873c98182e7280029b068.tar.gz barebox-359966df3721803a1e0873c98182e7280029b068.tar.xz |
scripts/compiler.h: inline functions in headers must be static
Without this building bareboxenv-target with gcc 7.3 fails with:
CC scripts/bareboxenv-target
/tmp/cc9G2oOY.o: In function `file_action':
bareboxenv.c:(.text+0x14): undefined reference to `xzalloc'
/tmp/cc9G2oOY.o: In function `concat_path_file':
bareboxenv.c:(.text+0xf4): undefined reference to `xmalloc'
/tmp/cc9G2oOY.o: In function `envfs_save':
bareboxenv.c:(.text+0x5b4): undefined reference to `xzalloc'
/tmp/cc9G2oOY.o: In function `envfs_load':
bareboxenv.c:(.text+0x7d8): undefined reference to `xmalloc'
collect2: error: ld returned 1 exit status
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts/compiler.h')
-rw-r--r-- | scripts/compiler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/compiler.h b/scripts/compiler.h index 0891c3bfa6..4cf179bb9b 100644 --- a/scripts/compiler.h +++ b/scripts/compiler.h @@ -113,7 +113,7 @@ typedef uint32_t __u32; (void) (&_min1 == &_min2); \ _min1 < _min2 ? _min1 : _min2; }) -inline void *xmalloc(size_t size) +static inline void *xmalloc(size_t size) { void *p = NULL; @@ -125,7 +125,7 @@ inline void *xmalloc(size_t size) return p; } -inline void *xzalloc(size_t size) +static inline void *xzalloc(size_t size) { void *p = xmalloc(size); memset(p, 0, size); |