[gnome-desktop/alatiera/locale-revert: 1/3] Revert "Use xlocale.h - fixes build on MacOS (possibly also FreeBSD)"




commit df40d5d46e210c242820adf604293a7bb07dea4f
Author: Jordan Petridis <jordan centricular com>
Date:   Fri Apr 9 20:40:37 2021 +0300

    Revert "Use xlocale.h - fixes build on MacOS (possibly also FreeBSD)"
    
    This reverts commit 8ddb9dce8ffe070b151f4f7a383863d5f5f139b6.

 libgnome-desktop/gnome-gettext-portable.c | 3 ---
 libgnome-desktop/gnome-gettext-portable.h | 4 ----
 meson.build                               | 1 -
 tests/wall-clock.c                        | 2 --
 4 files changed, 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]