diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-20 16:59:53 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-20 16:59:53 +0200 |
| commit | 1e3c35c1c860895ee6bfd483ef23a7aebfa7cda0 (patch) | |
| tree | f8f9b192b4d9914d8bb9ac2627f569dc1be8abc6 | |
| parent | 5240f22038603f025274173fad71d0d4dd544bef (diff) | |
| parent | a304e1ab4a622f8bf130b1a8cf904fe324c783a1 (diff) | |
| download | otp-1e3c35c1c860895ee6bfd483ef23a7aebfa7cda0.tar.gz otp-1e3c35c1c860895ee6bfd483ef23a7aebfa7cda0.tar.bz2 otp-1e3c35c1c860895ee6bfd483ef23a7aebfa7cda0.zip | |
Merge branch 'nox/fix-wcwidth/OTP-11106' into maint
* nox/fix-wcwidth/OTP-11106:
Properly guard WIDE_TAG use with HAVE_WCWIDTH in ttsl_drv
| -rw-r--r-- | erts/emulator/drivers/unix/ttsl_drv.c | 2 |
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; |