Handling broken musl toolchains that redefine sysinfo

OpenIPC · Aug 27, 2024 · 286a052 · 286a052
1 parent 8ffa510
commit 286a052
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/region.h b/src/region.h
@@ -9,7 +9,10 @@
 #include <unistd.h>
 #include <time.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+// Newer versions of musl have UAPI headers 
+// that redefine struct sysinfo
+#if defined(__GLIBC__) || defined(__UCLIBC__) \
+    || LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <sys/sysinfo.h>
 #else
 #include <linux/sysinfo.h>

diff --git a/src/server.h b/src/server.h
@@ -15,7 +15,10 @@
 #include <time.h>
 #include <unistd.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+// Newer versions of musl have UAPI headers 
+// that redefine struct sysinfo
+#if defined(__GLIBC__) || defined(__UCLIBC__) \
+    || LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <sys/sysinfo.h>
 #else
 #include <linux/sysinfo.h>