luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 02:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not build journal integration on older Linux platforms

Browse Source 
We need to add more checks for journal_sendv(), as we depend on the
presence of mkostemp() and O_CLOEXEC, which may not be available on
older Linux platforms, like RHEL 5.

https://bugzilla.gnome.org/show_bug.cgi?id=788705
This commit is contained in:
Emmanuele Bassi 2017-10-09 11:47:23 +01:00
parent f40154e218
commit dc39232ded
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/gmessages.c
View File

@ -2276,7 +2276,12 @@ g_log_writer_format_fields (GLogLevelFlags log_level,
return g_string_free (gstring, FALSE); return g_string_free (gstring, FALSE);
} }
#if defined(__linux__) && !defined(__BIONIC__) /* Enable support for the journal if we're on a recent enough Linux */
#if defined(__linux__) && !defined(__BIONIC__) && defined(HAVE_MKOSTEMP) && defined(O_CLOEXEC)
#define ENABLE_JOURNAL_SENDV
#endif
#ifdef ENABLE_JOURNAL_SENDV
static int static int
journal_sendv (struct iovec *iov, journal_sendv (struct iovec *iov,
gsize iovlen) gsize iovlen)
@ -2360,7 +2365,7 @@ retry2:
return -1; return -1;
} }
#endif #endif /* ENABLE_JOURNAL_SENDV */
/** /**
* g_log_writer_journald: * g_log_writer_journald:
@ -2390,7 +2395,7 @@ g_log_writer_journald (GLogLevelFlags log_level,
gsize n_fields, gsize n_fields,
gpointer user_data) gpointer user_data)
{ {
#if defined(__linux__) && !defined(__BIONIC__) #ifdef ENABLE_JOURNAL_SENDV
const char equals = '='; const char equals = '=';
const char newline = '\n'; const char newline = '\n';
gsize i, k; gsize i, k;
@ -2470,7 +2475,7 @@ g_log_writer_journald (GLogLevelFlags log_level,
return retval == 0 ? G_LOG_WRITER_HANDLED : G_LOG_WRITER_UNHANDLED; return retval == 0 ? G_LOG_WRITER_HANDLED : G_LOG_WRITER_UNHANDLED;
#else #else
return G_LOG_WRITER_UNHANDLED; return G_LOG_WRITER_UNHANDLED;
#endif #endif /* ENABLE_JOURNAL_SENDV */
} }
/** /**