Commit c26c5579 authored by Morten Welinder's avatar Morten Welinder Committed by Colin Walters

gsubprocesslauncher: Use "env" instead of "environ"

The latter may come from system headers.

https://bugzilla.gnome.org/show_bug.cgi?id=721059
parent 091e4660
......@@ -224,7 +224,7 @@ g_subprocess_launcher_new (GSubprocessFlags flags)
/**
* g_subprocess_launcher_set_environ:
* @self: a #GSubprocess
* @environ: the replacement environment
* @env: the replacement environment
*
* Replace the entire environment of processes launched from this
* launcher with the given 'environ' variable.
......@@ -244,10 +244,10 @@ g_subprocess_launcher_new (GSubprocessFlags flags)
**/
void
g_subprocess_launcher_set_environ (GSubprocessLauncher *self,
gchar **environ)
gchar **env)
{
g_strfreev (self->envp);
self->envp = g_strdupv (environ);
self->envp = g_strdupv (env);
}
/**
......
......@@ -56,7 +56,7 @@ GSubprocess * g_subprocess_launcher_spawnv (GSubpro
GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_environ (GSubprocessLauncher *self,
gchar **environ);
gchar **env);
GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_setenv (GSubprocessLauncher *self,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment