Commit | Line | Data |
---|---|---|
69fd9a5c FF |
1 | diff -u -r ../glib-2.50.1/glib/gmessages.c ./glib/gmessages.c |
2 | --- ../glib-2.50.1/glib/gmessages.c 2016-10-10 09:39:07.000000000 -0400 | |
3 | +++ ./glib/gmessages.c 2016-10-15 19:16:30.272794344 -0400 | |
4 | @@ -1842,7 +1842,7 @@ | |
5 | return isatty (output_fd); | |
6 | } | |
7 | ||
8 | -#ifdef __linux__ | |
9 | +#if defined(__linux__) && !defined(__ANDROID__) | |
10 | static int journal_fd = -1; | |
11 | ||
12 | #ifndef SOCK_CLOEXEC | |
13 | @@ -1881,7 +1881,7 @@ | |
14 | gboolean | |
15 | g_log_writer_is_journald (gint output_fd) | |
16 | { | |
17 | -#ifdef __linux__ | |
18 | +#if defined(__linux__) && !defined(__ANDROID__) | |
19 | /* FIXME: Use the new journal API for detecting whether we’re writing to the | |
20 | * journal. See: https://github.com/systemd/systemd/issues/2473 | |
21 | */ | |
22 | @@ -2016,7 +2016,7 @@ | |
23 | return g_string_free (gstring, FALSE); | |
24 | } | |
25 | ||
26 | -#ifdef __linux__ | |
27 | +#if defined(__linux__) && !defined(__ANDROID__) | |
28 | static int | |
29 | journal_sendv (struct iovec *iov, | |
30 | gsize iovlen) | |
31 | @@ -2130,7 +2130,7 @@ | |
32 | gsize n_fields, | |
33 | gpointer user_data) | |
34 | { | |
35 | -#ifdef __linux__ | |
36 | +#if defined(__linux__) && !defined(__ANDROID__) | |
37 | const char equals = '='; | |
38 | const char newline = '\n'; | |
39 | gsize i, k; |