aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-20 17:00:06 +0200
committerFredrik Gustafsson <[email protected]>2013-05-20 17:00:06 +0200
commit54f573cf5d849bcccef8b0bdfb417e85f8d22b1d (patch)
tree375611a21ee817f6abae01932cbb46e078eeeaf2
parent2576916f77bfd66d0835a1e51d43499288119a63 (diff)
parent1e3c35c1c860895ee6bfd483ef23a7aebfa7cda0 (diff)
downloadotp-54f573cf5d849bcccef8b0bdfb417e85f8d22b1d.tar.gz
otp-54f573cf5d849bcccef8b0bdfb417e85f8d22b1d.tar.bz2
otp-54f573cf5d849bcccef8b0bdfb417e85f8d22b1d.zip
Merge branch 'maint'
-rw-r--r--erts/emulator/drivers/unix/ttsl_drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c
index d76401a790..1e436830e7 100644
--- a/erts/emulator/drivers/unix/ttsl_drv.c
+++ b/erts/emulator/drivers/unix/ttsl_drv.c
@@ -1039,8 +1039,10 @@ static int write_buf(Uint32 *s, int n)
if (octbuff != octtmp) {
driver_free(octbuff);
}
+#ifdef HAVE_WCWIDTH
} else if (*s & WIDE_TAG) {
--n; s++;
+#endif
} else {
DEBUGLOG(("Very unexpected character %d",(int) *s));
++n;