aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@gnome.org>2012-10-04 21:34:23 +0800
committerAntoine Jacoutot <ajacoutot@gnome.org>2012-10-04 21:46:49 +0800
commit1cfe0327ca436a687383412664e3a5c2869c7dda (patch)
treebd81ef9e66662a90084c9d12a9075b20410c6312 /modules
parente1fa1d2d0f24e0d12cffd202fa527e6add5b58a0 (diff)
downloadgsoc2013-evolution-1cfe0327ca436a687383412664e3a5c2869c7dda.tar
gsoc2013-evolution-1cfe0327ca436a687383412664e3a5c2869c7dda.tar.gz
gsoc2013-evolution-1cfe0327ca436a687383412664e3a5c2869c7dda.tar.bz2
gsoc2013-evolution-1cfe0327ca436a687383412664e3a5c2869c7dda.tar.lz
gsoc2013-evolution-1cfe0327ca436a687383412664e3a5c2869c7dda.tar.xz
gsoc2013-evolution-1cfe0327ca436a687383412664e3a5c2869c7dda.tar.zst
gsoc2013-evolution-1cfe0327ca436a687383412664e3a5c2869c7dda.zip
portability: don't use too generic variable names
OpenBSD (and maybe other OS) already declare stdout and stdin in <stdio.h> which breaks evolution build, so prefix both with "pipe_" to prevent clashing. https://bugzilla.gnome.org/show_bug.cgi?id=685471
Diffstat (limited to 'modules')
-rw-r--r--modules/text-highlight/e-mail-formatter-text-highlight.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c
index d3bec3878b..48c6e7a742 100644
--- a/modules/text-highlight/e-mail-formatter-text-highlight.c
+++ b/modules/text-highlight/e-mail-formatter-text-highlight.c
@@ -187,7 +187,7 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
return TRUE;
} else if (context->mode == E_MAIL_FORMATTER_MODE_RAW) {
- gint stdin, stdout;
+ gint pipe_stdin, pipe_stdout;
GPid pid;
CamelStream *read, *write, *utf8;
CamelDataWrapper *dw;
@@ -262,12 +262,12 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
NULL, (gchar **) argv, NULL,
G_SPAWN_SEARCH_PATH |
G_SPAWN_DO_NOT_REAP_CHILD,
- NULL, NULL, &pid, &stdin, &stdout, NULL, NULL)) {
+ NULL, NULL, &pid, &pipe_stdin, &pipe_stdout, NULL, NULL)) {
return FALSE;
}
- write = camel_stream_fs_new_with_fd (stdin);
- read = camel_stream_fs_new_with_fd (stdout);
+ write = camel_stream_fs_new_with_fd (pipe_stdin);
+ read = camel_stream_fs_new_with_fd (pipe_stdout);
/* Decode the content of mime part to the 'utf8' stream */
utf8 = camel_stream_mem_new ();