From cd07923dd2ed34aca353dfd182f2f85c13853fd9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 14 Mar 2016 14:14:30 +0000 Subject: [PATCH 1/2] fix compilation with musl libc the HZ define is not exposed by musl libc. --- src/os/linux/linux_sigar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/os/linux/linux_sigar.c b/src/os/linux/linux_sigar.c index a3fd2301..7f38497d 100644 --- a/src/os/linux/linux_sigar.c +++ b/src/os/linux/linux_sigar.c @@ -46,6 +46,10 @@ #define PROC_PARTITIONS PROC_FS_ROOT "partitions" #define PROC_DISKSTATS PROC_FS_ROOT "diskstats" +#ifndef HZ +#define HZ 100 +#endif + /* * /proc/self/stat fields: * 1 - pid From 621764c13d2de3e03c77eb6cbc4cc9e472f193c5 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 14 Mar 2016 14:17:29 +0000 Subject: [PATCH 2/2] only enable the GNU libc strerror_r on GNU libc We don't want use the non-standard GNU libc variant of strerror_r on musl libc, or any libc other than GNU. --- src/os/linux/sigar_os.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/linux/sigar_os.h b/src/os/linux/sigar_os.h index 29a2ba32..7e1ead7d 100644 --- a/src/os/linux/sigar_os.h +++ b/src/os/linux/sigar_os.h @@ -70,7 +70,7 @@ struct sigar_t { }; #define HAVE_STRERROR_R -#ifndef __USE_XOPEN2K +#if !defined(__USE_XOPEN2K) && defined(__GLIBC__) /* use gnu version of strerror_r */ #define HAVE_STRERROR_R_GLIBC #endif