From c26c557908fe3083e9470b2a191cd53dc907138d Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra@gnome.org>
Date: Thu, 26 Dec 2013 07:37:17 -0500
Subject: gsubprocesslauncher: Use "env" instead of "environ"

The latter may come from system headers.

https://bugzilla.gnome.org/show_bug.cgi?id=721059
---
 gio/gsubprocesslauncher.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gio/gsubprocesslauncher.c')

diff --git a/gio/gsubprocesslauncher.c b/gio/gsubprocesslauncher.c
index 3b1530053..7b1ca486c 100644
--- a/gio/gsubprocesslauncher.c
+++ b/gio/gsubprocesslauncher.c
@@ -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);
 }
 
 /**
-- 
cgit v1.2.3-70-g09d2