From: Tom Tromey <tromey@adacore.com>
Date: Wed, 8 May 2019 16:35:09 +0000 (-0600)
Subject: Fix build problem in fputs_maybe_filtered
X-Git-Tag: binutils-2_33~1342
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca1df239078318425cf8038995bf02f1b9ab6e50;p=thirdparty%2Fbinutils-gdb.git

Fix build problem in fputs_maybe_filtered

When merging commit 99f20f ("Fix style bug when paging") to master, I
had to make some changes to get it to compile again.  Unfortunately, I
must not have added these to the index at the correct time, because
they were not committed.

This patch fixes the problem.

gdb/ChangeLog
2019-05-08  Tom Tromey  <tromey@adacore.com>

	* utils.c (fputs_maybe_filtered): Call can_emit_style_escape as a
	method.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ca20a7c3654..ec2424a5bc8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-08  Tom Tromey  <tromey@adacore.com>
+
+	* utils.c (fputs_maybe_filtered): Call can_emit_style_escape as a
+	method.
+
 2019-05-08  Tom Tromey  <tromey@adacore.com>
 
 	* utils.c (fputs_maybe_filtered): Reset style after paging, even
diff --git a/gdb/utils.c b/gdb/utils.c
index 10fa5bcce64..96869274735 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1826,7 +1826,7 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream,
 		    + (save_chars - wrap_column);
 		  wrap_column = 0;	/* And disable fancy wrap */
 		}
-	      else if (did_paginate && can_emit_style_escape (stream))
+	      else if (did_paginate && stream->can_emit_style_escape ())
 		emit_style_escape (save_style, stream);
 	    }
 	}