Skip to content

Commit

Permalink
Fix build with musl libc
Browse files Browse the repository at this point in the history
Suppress inclusion of linux/sysinfo.h to fix redefinition of struct sysinfo
that musl libc defines in sys/sysinfo.h, which least to the following build
failure (paths abbreviated):

In file included from .../usr/include/linux/kernel.h:4:0,
                 from .../usr/include/linux/ethtool.h:16,
                 from psutil/_psutil_linux.c:35:
.../usr/include/linux/sysinfo.h:7:8: error: redefinition of ‘struct sysinfo’
 struct sysinfo {
        ^
In file included from psutil/_psutil_linux.c:21:0:
.../usr/include/sys/sysinfo.h:10:8: note: originally defined here
 struct sysinfo {
        ^

Fixes #872
  • Loading branch information
baruchsiach committed Feb 16, 2017
1 parent d964eeb commit c414ecd
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions psutil/_psutil_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
typedef __u16 u16;
typedef __u8 u8;
#endif
/* Avoid redefinition of struct sysinfo with musl libc */
#define _LINUX_SYSINFO_H
#include <linux/ethtool.h>

/* The minimum number of CPUs allocated in a cpu_set_t */
Expand Down

0 comments on commit c414ecd

Please sign in to comment.