From 3ff9fb450aa2a28221fcd863bf7913e84eeeb7ba Mon Sep 17 00:00:00 2001 From: listout Date: Fri, 5 May 2023 11:07:20 +0530 Subject: [PATCH] unconditionally include stdio.h and locale.h On musl mate-sensor-applet fails to build with error message saying "LC_NUMERIC undeclared". As suggested in issue mate-desktop#123, removing the include guards around #include and #include Signed-off-by: listout --- configure.ac | 1 - plugins/acpi/acpi-plugin.c | 3 --- plugins/i2c-proc/i2c-proc-plugin.c | 6 ------ plugins/i2c-sys/i2c-sys-plugin.c | 3 --- plugins/i8k/i8k-plugin.c | 3 --- plugins/ibm-acpi/ibm-acpi-plugin.c | 3 --- plugins/omnibook/omnibook-plugin.c | 3 --- plugins/pmu-sys/pmu-sys-plugin.c | 3 --- plugins/smu-sys/smu-sys-plugin.c | 3 --- 9 files changed, 28 deletions(-) diff --git a/configure.ac b/configure.ac index 33e0e3e3..c5f532ee 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,6 @@ AC_SUBST(LIBS) AC_CHECK_HEADERS( stdlib.h \ string.h \ - stdio.h \ sys/types.h \ sys/socket.h \ netinet/in.h \ diff --git a/plugins/acpi/acpi-plugin.c b/plugins/acpi/acpi-plugin.c index add40a5d..fc361139 100644 --- a/plugins/acpi/acpi-plugin.c +++ b/plugins/acpi/acpi-plugin.c @@ -21,10 +21,7 @@ #include #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_STDIO_H #include -#endif /* HAVE_STDIO_H */ - #include #include #include "acpi-plugin.h" diff --git a/plugins/i2c-proc/i2c-proc-plugin.c b/plugins/i2c-proc/i2c-proc-plugin.c index 1ed81fe9..4a63a8ac 100644 --- a/plugins/i2c-proc/i2c-proc-plugin.c +++ b/plugins/i2c-proc/i2c-proc-plugin.c @@ -21,14 +21,8 @@ #include #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_STDIO_H #include -#endif /* HAVE_STDIO_H */ - -#ifdef HAVE_LOCALE_H #include -#endif - #include #include #include "i2c-proc-plugin.h" diff --git a/plugins/i2c-sys/i2c-sys-plugin.c b/plugins/i2c-sys/i2c-sys-plugin.c index b39ede43..203f4c81 100644 --- a/plugins/i2c-sys/i2c-sys-plugin.c +++ b/plugins/i2c-sys/i2c-sys-plugin.c @@ -21,10 +21,7 @@ #include #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_STDIO_H #include -#endif /* HAVE_STDIO_H */ - #include #include #include "i2c-sys-plugin.h" diff --git a/plugins/i8k/i8k-plugin.c b/plugins/i8k/i8k-plugin.c index 826c7bd6..0fa58b5b 100644 --- a/plugins/i8k/i8k-plugin.c +++ b/plugins/i8k/i8k-plugin.c @@ -21,10 +21,7 @@ #include #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_STDIO_H #include -#endif /* HAVE_STDIO_H */ - #include #include #include "i8k-plugin.h" diff --git a/plugins/ibm-acpi/ibm-acpi-plugin.c b/plugins/ibm-acpi/ibm-acpi-plugin.c index 9bf36157..d3357da8 100644 --- a/plugins/ibm-acpi/ibm-acpi-plugin.c +++ b/plugins/ibm-acpi/ibm-acpi-plugin.c @@ -21,10 +21,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_STDIO_H #include -#endif /* HAVE_STDIO_H */ - #include #include #include "ibm-acpi-plugin.h" diff --git a/plugins/omnibook/omnibook-plugin.c b/plugins/omnibook/omnibook-plugin.c index 5d6ff91c..7728110a 100644 --- a/plugins/omnibook/omnibook-plugin.c +++ b/plugins/omnibook/omnibook-plugin.c @@ -21,10 +21,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_STDIO_H #include -#endif /* HAVE_STDIO_H */ - #include #include #include "omnibook-plugin.h" diff --git a/plugins/pmu-sys/pmu-sys-plugin.c b/plugins/pmu-sys/pmu-sys-plugin.c index 1cac7e9d..7b01aa1e 100644 --- a/plugins/pmu-sys/pmu-sys-plugin.c +++ b/plugins/pmu-sys/pmu-sys-plugin.c @@ -21,10 +21,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_STDIO_H #include -#endif /* HAVE_STDIO_H */ - #include #include #include "pmu-sys-plugin.h" diff --git a/plugins/smu-sys/smu-sys-plugin.c b/plugins/smu-sys/smu-sys-plugin.c index fbf3ff6b..3bea0ace 100644 --- a/plugins/smu-sys/smu-sys-plugin.c +++ b/plugins/smu-sys/smu-sys-plugin.c @@ -21,10 +21,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifdef HAVE_STDIO_H #include -#endif /* HAVE_STDIO_H */ - #include #include #include "smu-sys-plugin.h"