Skip to content

Commit

Permalink
scripts/compiler.h: inline functions in headers must be static
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Sascha Hauer <[email protected]>
  • Loading branch information
michaelolbrich authored and saschahauer committed Feb 9, 2018
1 parent 2b3659b commit 359966d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down

0 comments on commit 359966d

Please sign in to comment.