aboutsummaryrefslogtreecommitdiff
path: root/readline
diff options
context:
space:
mode:
authorChristian Biesinger <cbiesinger@google.com>2019-08-13 14:00:58 -0500
committerChristian Biesinger <cbiesinger@google.com>2019-08-13 14:57:03 -0500
commit011168429859e3e3a2342ee043cbc2c7a5cf5e2f (patch)
tree2416f8a0c28fa08ad6e6a1d08798bd736f876561 /readline
parent29c9291108487e1dd9bc5677dafee58ea2068f77 (diff)
downloadgdb-011168429859e3e3a2342ee043cbc2c7a5cf5e2f.zip
gdb-011168429859e3e3a2342ee043cbc2c7a5cf5e2f.tar.gz
gdb-011168429859e3e3a2342ee043cbc2c7a5cf5e2f.tar.bz2
[readline] Fix compilation on MinGW
S_ISLNK should not be called outside of an #ifdef. However, this specific call is actually unnecessary, because linkok can only be 0 if S_ISLNK is true, per the code above. I have sent a bug report to bug-readline, though it does not show up in the online archive yet. 2019-08-13 Christian Biesinger <cbiesinger@google.com> * colors.c (_rl_print_color_indicator): Remove unnecessary S_ISLNK check to fix compilation on MinGW.
Diffstat (limited to 'readline')
-rw-r--r--readline/ChangeLog.gdb5
-rw-r--r--readline/colors.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index 982ef7b..01b0839 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,8 @@
+2019-08-13 Christian Biesinger <cbiesinger@google.com>
+
+ * colors.c (_rl_print_color_indicator): Remove unnecessary
+ S_ISLNK check to fix compilation on MinGW.
+
2019-08-12 Tom Tromey <tom@tromey.com>
* Imported readline 8.0.
diff --git a/readline/colors.c b/readline/colors.c
index 53758e0..81aecfe 100644
--- a/readline/colors.c
+++ b/readline/colors.c
@@ -175,7 +175,7 @@ _rl_print_color_indicator (const char *f)
if (linkok == -1 && _rl_color_indicator[C_MISSING].string != NULL)
colored_filetype = C_MISSING;
- else if (linkok == 0 && S_ISLNK(mode) && _rl_color_indicator[C_ORPHAN].string != NULL)
+ else if (linkok == 0 && _rl_color_indicator[C_ORPHAN].string != NULL)
colored_filetype = C_ORPHAN; /* dangling symlink */
else if(stat_ok != 0)
{