Fixing the sysinfo conflict between toolchains, pre-defining the miss…

…ing asprintf on uclibc
OpenIPC · Aug 8, 2024 · bc5f64a · bc5f64a
1 parent d7e4b62
commit bc5f64a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/network.h b/src/network.h
@@ -8,5 +8,9 @@
 #include <stdio.h>
 #include <sys/utsname.h>
 
+#ifdef __UCLIBC__
+extern int asprintf(char **restrict strp, const char *restrict fmt, ...);
+#endif
+
 int start_mdns();
 void stop_mdns();
diff --git a/src/region.h b/src/region.h
@@ -19,12 +19,16 @@
 
 #include <ifaddrs.h>
 #include <linux/if_link.h>
+#include <linux/version.h>
 #include <pthread.h>
 #include <time.h>
 
 #ifdef __UCLIBC__
-#include <sys/sysinfo.h>
 extern int asprintf(char **restrict strp, const char *restrict fmt, ...);
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+#include <sys/sysinfo.h>
 #else
 #include <linux/sysinfo.h>
 #endif