Commit 353b8d9e authored by Christian Hergert's avatar Christian Hergert
Browse files

build: fix use of reserved word environ

Fixes #1210
parent b60c7d68
......@@ -392,7 +392,7 @@ gbp_buildui_config_view_addin_load (IdeConfigViewAddin *addin,
IdeRuntimeManager *runtime_manager;
g_autoptr(GFile) workdir = NULL;
IdeBuildSystem *build_system;
IdeEnvironment *environ;
IdeEnvironment *environ_;
IdeContext *context;
GtkWidget *box;
GtkWidget *entry;
......@@ -485,12 +485,12 @@ gbp_buildui_config_view_addin_load (IdeConfigViewAddin *addin,
dzl_preferences_add_custom (preferences, "general", "toolchain", create_toolchain_box (config, toolchain_manager), NULL, 10);
/* Add environment selector */
environ = ide_config_get_environment (config);
environ_ = ide_config_get_environment (config);
dzl_preferences_add_custom (preferences, "environ", "build",
g_object_new (GTK_TYPE_FRAME,
"visible", TRUE,
"child", g_object_new (IDE_TYPE_ENVIRONMENT_EDITOR,
"environment", environ,
"environment", environ_,
"visible", TRUE,
NULL),
NULL),
......
......@@ -73,7 +73,7 @@ gbp_podman_subprocess_launcher_spawn (IdeSubprocessLauncher *launcher,
if (!g_strv_contains (argv, "podman"))
{
const gchar * const *environ;
const gchar * const *environ_;
const gchar *cwd;
guint i = 0;
gint max_fd;
......@@ -125,12 +125,12 @@ gbp_podman_subprocess_launcher_spawn (IdeSubprocessLauncher *launcher,
copy_envvar (launcher, i++, "XDG_VTNR");
}
if ((environ = ide_subprocess_launcher_get_environ (launcher)))
if ((environ_ = ide_subprocess_launcher_get_environ (launcher)))
{
for (guint j = 0; environ[j]; j++)
for (guint j = 0; environ_[j]; j++)
{
ide_subprocess_launcher_insert_argv (launcher, i++, "--env");
ide_subprocess_launcher_insert_argv (launcher, i++, environ[j]);
ide_subprocess_launcher_insert_argv (launcher, i++, environ_[j]);
}
ide_subprocess_launcher_set_environ (launcher, NULL);
......
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