Remove last vestiges of #ifdef BANG

[nmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 97a0b4a3abf216d61b9c0de4f4c2906d2627362b..8d0383608c03053b66e24d615526d791de6c259e 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -126,10 +126,11 @@ cpnumber(char **dest, int num, unsigned int wid, char fill, size_t n) {
 static void
 cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
     int remaining;     /* remaining output width available */
 static void
 cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
     int remaining;     /* remaining output width available */

-    int c, ljust, w;
+    int c, ljust;

     int end;           /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
     int char_len;      /* bytes in current character */
     int end;           /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
     int char_len;      /* bytes in current character */

+    int w;

     wchar_t wide_char;
 #endif
     char *sp;          /* current position in source string */
     wchar_t wide_char;
 #endif
     char *sp;          /* current position in source string */