diff options
| author | Jordan Petridis <jordan@centricular.com> | 2021-04-09 20:40:37 +0300 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2021-04-09 20:40:37 +0300 |
| commit | df40d5d46e210c242820adf604293a7bb07dea4f (patch) | |
| tree | d25e8e6c4830a500f89f65a68662339869c2133f | |
| parent | a08a1589c6a30df728684bc29206c18cfdd6cb1a (diff) | |
| download | gnome-desktop-df40d5d46e210c242820adf604293a7bb07dea4f.tar.gz | |
Revert "Use xlocale.h - fixes build on MacOS (possibly also FreeBSD)"
This reverts commit 8ddb9dce8ffe070b151f4f7a383863d5f5f139b6.
| -rw-r--r-- | libgnome-desktop/gnome-gettext-portable.c | 3 | ||||
| -rw-r--r-- | libgnome-desktop/gnome-gettext-portable.h | 4 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | tests/wall-clock.c | 2 |
4 files changed, 0 insertions, 10 deletions
diff --git a/libgnome-desktop/gnome-gettext-portable.c b/libgnome-desktop/gnome-gettext-portable.c index 75083eb2..aaba4d08 100644 --- a/libgnome-desktop/gnome-gettext-portable.c +++ b/libgnome-desktop/gnome-gettext-portable.c @@ -20,9 +20,6 @@ #include "config.h" #include <locale.h> -#ifdef HAVE_XLOCALE -#include <xlocale.h> -#endif #include <glib.h> #include <glib/gi18n-lib.h> diff --git a/libgnome-desktop/gnome-gettext-portable.h b/libgnome-desktop/gnome-gettext-portable.h index 9dd65712..c8af3691 100644 --- a/libgnome-desktop/gnome-gettext-portable.h +++ b/libgnome-desktop/gnome-gettext-portable.h @@ -23,10 +23,6 @@ #include <locale.h> #include <string.h> -#ifdef HAVE_XLOCALE -#include <xlocale.h> -#endif - const char * dgettext_l (locale_t locale, const char *domain, diff --git a/meson.build b/meson.build index 00cf25fb..490d43e6 100644 --- a/meson.build +++ b/meson.build @@ -95,7 +95,6 @@ conf.set('HAVE_XKBREGISTRY', xkbregistry_dep.found()) conf.set('HAVE_TIMERFD', cc.has_function('timerfd_create')) conf.set('HAVE_OPENAT', cc.has_function('openat')) conf.set('HAVE_USELOCALE', cc.has_function('uselocale')) -conf.set('HAVE_XLOCALE', cc.has_header('xlocale.h')) config_h = declare_dependency( sources: configure_file( diff --git a/tests/wall-clock.c b/tests/wall-clock.c index 44bc93bb..a980c951 100644 --- a/tests/wall-clock.c +++ b/tests/wall-clock.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "config.h" - #include <gdesktop-enums.h> #include <glib.h> #define GNOME_DESKTOP_USE_UNSTABLE_API |