aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/nat/fork-inferior.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 931842b..d83f087 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-14 Tom Tromey <tom@tromey.com>
+
+ * nat/fork-inferior.c (get_startup_shell): Remove "static".
+
2018-09-13 Tom Tromey <tom@tromey.com>
* python/py-inferior.c (infpy_thread_from_thread_handle): Now
diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c
index ea71aad..40cd05a 100644
--- a/gdb/nat/fork-inferior.c
+++ b/gdb/nat/fork-inferior.c
@@ -272,9 +272,7 @@ execv_argv::init_for_shell (const char *exec_file,
static const char *
get_startup_shell ()
{
- static const char *ret;
-
- ret = getenv ("SHELL");
+ const char *ret = getenv ("SHELL");
if (ret == NULL)
ret = SHELL_FILE;