waltarix

diff --git a/main.c b/main.c
index b421943..865c744 100644
--- a/main.c
+++ b/main.c
@@ -833,7 +833,12 @@ main(int argc, char **argv, char **envp)
     mySignal(SIGPIPE, SigPipe);
 #endif
 
+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
+    orig_GC_warn_proc = GC_get_warn_proc();

waltarix

diff --git a/Makefile.in b/Makefile.in
index 60bb1ed..d8cba0d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4609,7 +4609,7 @@ src_logname_LDADD = $(LDADD)
 
 # for cap_get_file
 src_ls_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_SMACK) \
-	$(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_HAS_ACL)
+	$(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_HAS_ACL) $(LIBICONV)

waltarix

diff --git a/Src/compat.c b/Src/compat.c
index 9041c0b..4d2b320 100644
--- a/Src/compat.c
+++ b/Src/compat.c
@@ -860,6 +860,7 @@ int mk_wcswidth(const wchar_t *pwcs, size_t n)
 
   return width;
 }
+#endif /* 0 */
 

waltarix

diff --git a/Src/utils.c b/Src/utils.c
index 26e2a5c..04c3783 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -4244,6 +4244,13 @@ mod_export char *
 zreaddir(DIR *dir, int ignoredots)
 {
     struct dirent *de;
+#ifdef HAVE_ICONV
+    static iconv_t conv_ds = (iconv_t)NULL;

waltarix

diff --git a/screen-write.c b/screen-write.c
index 15f8d07..8a175a6 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1334,6 +1334,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 	ctx->cells++;
 
 	/* If the width is zero, combine onto the previous character. */
+	/*
 	if (width == 0) {

waltarix

diff --git a/Makefile.devel b/Makefile.devel
index 8f6399c..320c123 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -106,7 +106,7 @@ lib/aliases.h lib/canonical.h lib/canonical_local.h : lib/encodings.def lib/enco
 	$(CC) $(CFLAGS) lib/genaliases.c -o genaliases
 	./genaliases > lib/aliases.gperf 3> canonical.sh 4> canonical_local.sh
 	$(RM) genaliases
-	$(GPERF) -m 10 lib/aliases.gperf > tmp.h
+	$(GPERF) lib/aliases.gperf > tmp.h