[PATCH 2/2] gdb: Fix a type of sentinel

Lukas Durfina ldurfina@tachyum.com
Tue Jan 28 15:05:00 GMT 2020


---
 gdb/ChangeLog | 4 ++++
 gdb/charset.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8b6da62bd4..1dd89ae2e0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-28 Lukas Durfina <ldurfina@tachyum.com>
+
+	* charset.c (find_charset_names): Fix a type of sentinel.
+
 2020-01-26  Tom Tromey  <tom@tromey.com>
 
 	* ctfread.c (struct ctf_fp_info): Reindent.
diff --git a/gdb/charset.c b/gdb/charset.c
index 5cfd2d8030..abf795ce6d 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -818,7 +818,7 @@ find_charset_names (void)
   {
     std::string iconv_dir = relocate_gdb_directory (ICONV_BIN,
 						    ICONV_BIN_RELOCATABLE);
-    iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", NULL);
+    iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", (char *) NULL);
   }
 #else
   iconv_program = xstrdup ("iconv");
-- 
2.17.1



More information about the Gdb-patches mailing list