For FreeBSD builds, also search the ports tree for includes and libs.

[nmh] / sbr / charstring.c

diff --git a/sbr/charstring.c b/sbr/charstring.c
index 76d9fa2afdf5946006ecca9c23a9addf5dcdcf0d..d007e7b59c11740267104850cf929c2bf52396bc 100644 (file)
--- a/sbr/charstring.c
+++ b/sbr/charstring.c
@@ -161,13 +161,14 @@ charstring_last_char_len (const charstring_t s) {
     const char *sp = charstring_buffer (s);
     size_t remaining = charstring_bytes (s);
 
-    (void) mbtowc (NULL, NULL, 0); /* reset shift state */
+    if (mbtowc (NULL, NULL, 0)) {} /* reset shift state */
 
     while (*sp  &&  remaining > 0) {
         wchar_t wide_char;
 
-        len = mbtowc (&wide_char, sp,
-                      MB_CUR_MAX < remaining ? MB_CUR_MAX : remaining);
+        len = mbtowc (&wide_char, sp, (size_t) MB_CUR_MAX < remaining
+                                          ? (size_t) MB_CUR_MAX
+                                          : remaining);
         sp += len > 0 ? len : 1;
         remaining -= len > 0 ? len : 1;
     }