From 0da4b1bf3148cfd029833f3cdb78ff55ef70272a Mon Sep 17 00:00:00 2001 From: "L. E. Segovia" Date: Tue, 2 Apr 2024 08:40:48 -0300 Subject: [PATCH] gio-launch-desktop, gmessages: Fix journald support using __BIONIC__ to skip support on Android As per the Bionic docs, this functionality is Android, not bionic specific. See: https://android.googlesource.com/platform/bionic/+/HEAD/docs/defines.md --- gio/gio-launch-desktop.c | 4 ++-- glib/gjournal-private.c | 2 +- glib/gmessages.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gio/gio-launch-desktop.c b/gio/gio-launch-desktop.c index 47717b987..a508f7ff4 100644 --- a/gio/gio-launch-desktop.c +++ b/gio/gio-launch-desktop.c @@ -37,7 +37,7 @@ #include #include -#if defined(__linux__) && !defined(__BIONIC__) +#if defined(__linux__) && !defined(__ANDROID__) #include #include #include @@ -252,7 +252,7 @@ main (int argc, char *argv[]) putenv (buf); -#if defined(__linux__) && !defined(__BIONIC__) +#if defined(__linux__) && !defined(__ANDROID__) set_up_journal (argv[1]); #endif diff --git a/glib/gjournal-private.c b/glib/gjournal-private.c index f45e2cf1c..fbc32e468 100644 --- a/glib/gjournal-private.c +++ b/glib/gjournal-private.c @@ -22,7 +22,7 @@ #include "gjournal-private.h" -#if defined(__linux__) && !defined(__BIONIC__) +#if defined(__linux__) && !defined(__ANDROID__) #include #include #include diff --git a/glib/gmessages.c b/glib/gmessages.c index 06437f621..f325a9196 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -38,7 +38,7 @@ #include #include -#if defined(__linux__) && !defined(__BIONIC__) +#if defined(__linux__) && !defined(__ANDROID__) #include #include #include @@ -68,7 +68,7 @@ #include #endif -#if defined(__linux__) && !defined(__BIONIC__) +#if defined(__linux__) && !defined(__ANDROID__) #include "gjournal-private.h" #endif @@ -2053,7 +2053,7 @@ G_LOCK_DEFINE_STATIC (syslog_opened); #endif #endif -#if defined(__linux__) && !defined(__BIONIC__) +#if defined(__linux__) && !defined(__ANDROID__) static int journal_fd = -1; #ifndef SOCK_CLOEXEC @@ -2098,7 +2098,7 @@ open_journal (void) gboolean g_log_writer_is_journald (gint output_fd) { -#if defined(__linux__) && !defined(__BIONIC__) +#if defined(__linux__) && !defined(__ANDROID__) return _g_fd_is_journal (output_fd); #else return FALSE; @@ -2350,7 +2350,7 @@ g_log_writer_syslog (GLogLevelFlags log_level, } /* Enable support for the journal if we're on a recent enough Linux */ -#if defined(__linux__) && !defined(__BIONIC__) && defined(HAVE_MKOSTEMP) && defined(O_CLOEXEC) +#if defined(__linux__) && !defined(__ANDROID__) && defined(HAVE_MKOSTEMP) && defined(O_CLOEXEC) #define ENABLE_JOURNAL_SENDV #endif