diff options
| author | Don Scorgie <dscorgie@src.gnome.org> | 2007-08-07 18:17:26 +0000 |
|---|---|---|
| committer | Don Scorgie <dscorgie@src.gnome.org> | 2007-08-07 18:17:26 +0000 |
| commit | 18af9a26bf7c2c131b50610cad420f483e3c1ca3 (patch) | |
| tree | 14c55a4f3700c6e73b08b90cb94a8cf5d68b9231 | |
| parent | b03b2f9870f071ee58c49e6602e89d24a5392c30 (diff) | |
| download | yelp-18af9a26bf7c2c131b50610cad420f483e3c1ca3.tar.gz | |
s/std{out,err}/str_std{out,err}/g Fixes build on Solaris - bug #462440
* src/yelp-window.c:
s/std{out,err}/str_std{out,err}/g
Fixes build on Solaris - bug #462440
svn path=/trunk/; revision=2872
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/yelp-window.c | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,9 @@ 2007-08-07 Don Scorgie <dscorgie@svn.gnome.org> + * src/yelp-window.c: + s/std{out,err}/str_std{out,err}/g + Fixes build on Solaris - bug #462440 + * src/yelp-base.c: Remove forgotten c++ comment (bug #462813, hopefully) diff --git a/src/yelp-window.c b/src/yelp-window.c index f28e39f8..89729b51 100644 --- a/src/yelp-window.c +++ b/src/yelp-window.c @@ -1043,18 +1043,18 @@ yelp_window_load (YelpWindow *window, const gchar *uri) break; case YELP_RRN_TYPE_EXTERNAL: { - gchar *stdout = NULL; - gchar *stderr = NULL; + gchar *str_stdout = NULL; + gchar *str_stderr = NULL; gchar *cmd = NULL; gint status = 0; GError *error = NULL; cmd = g_strdup_printf ("gnome-open %s", uri); - if (!g_spawn_command_line_sync (cmd, &stdout, &stderr, &status, &error)) { + if (!g_spawn_command_line_sync (cmd, &str_stdout, &str_stderr, &status, &error)) { g_free (error); error = NULL; g_free (cmd); cmd = g_strdup_printf ("xdg-open %s", uri); - if (!g_spawn_command_line_sync (cmd, &stdout, &stderr, &status, &error)) { + if (!g_spawn_command_line_sync (cmd, &str_stdout, &str_stderr, &status, &error)) { window_error(window, _("Error executing \"gnome-open\""), error->message, FALSE); return; } |