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

gmessages: Fix compilation on Android

Browse Source 
There is no systemd on Android.

https://bugzilla.gnome.org/show_bug.cgi?id=775621
This commit is contained in:
Sebastian Dröge 2016-12-05 12:10:48 +02:00
parent 7a61a94b95
commit 620b3c1e56
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gmessages.c
View File

@ -175,7 +175,7 @@
#include <locale.h> #include <locale.h>
#include <errno.h> #include <errno.h>
#ifdef __linux__ #if defined(__linux__) && !defined(__BIONIC__)
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
@ -1922,7 +1922,7 @@ g_log_writer_supports_color (gint output_fd)
#endif #endif
} }
#ifdef __linux__ #if defined(__linux__) && !defined(__BIONIC__)
static int journal_fd = -1; static int journal_fd = -1;
#ifndef SOCK_CLOEXEC #ifndef SOCK_CLOEXEC
@ -1961,7 +1961,7 @@ open_journal (void)
gboolean gboolean
g_log_writer_is_journald (gint output_fd) g_log_writer_is_journald (gint output_fd)
{ {
#ifdef __linux__ #if defined(__linux__) && !defined(__BIONIC__)
/* FIXME: Use the new journal API for detecting whether we’re writing to the /* FIXME: Use the new journal API for detecting whether we’re writing to the
* journal. See: https://github.com/systemd/systemd/issues/2473 * journal. See: https://github.com/systemd/systemd/issues/2473
*/ */
@ -2096,7 +2096,7 @@ g_log_writer_format_fields (GLogLevelFlags log_level,
return g_string_free (gstring, FALSE); return g_string_free (gstring, FALSE);
} }
#ifdef __linux__ #if defined(__linux__) && !defined(__BIONIC__)
static int static int
journal_sendv (struct iovec *iov, journal_sendv (struct iovec *iov,
gsize iovlen) gsize iovlen)
@ -2210,7 +2210,7 @@ g_log_writer_journald (GLogLevelFlags log_level,
gsize n_fields, gsize n_fields,
gpointer user_data) gpointer user_data)
{ {
#ifdef __linux__ #if defined(__linux__) && !defined(__BIONIC__)
const char equals = '='; const char equals = '=';
const char newline = '\n'; const char newline = '\n';
gsize i, k; gsize i, k;