]> git.ipfire.org Git - thirdparty/libbsd.git/commitdiff
Use CHAR_BIT instead of NBBY in strnvis()
authorAaron Dierking <aarond@fb.com>
Thu, 14 Jun 2018 18:38:31 +0000 (11:38 -0700)
committerGuillem Jover <guillem@hadrons.org>
Mon, 18 Jun 2018 02:31:00 +0000 (04:31 +0200)
<sys/param.h> is not available on Windows.

Signed-off-by: Guillem Jover <guillem@hadrons.org>
src/vis.c

index 3e6ade8b22c9771e584f7d70781ad0723665aec5..260d3c1141f11858827f09a587a1d5c048fbd663 100644 (file)
--- a/src/vis.c
+++ b/src/vis.c
@@ -57,7 +57,6 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <assert.h>
 #pragma GCC diagnostic push
@@ -308,7 +307,7 @@ do_svis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
        /* See comment in istrsenvisx() output loop, below. */
        wmsk = 0;
        for (i = sizeof(wmsk) - 1; i >= 0; i--) {
-               shft = i * NBBY;
+               shft = i * CHAR_BIT;
                bmsk = (uint64_t)0xffLL << shft;
                wmsk |= bmsk;
                if ((c & wmsk) || i == 0)
@@ -539,7 +538,7 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *mbsrc, size_t mblength,
                        clen = 0;
                        wmsk = 0;
                        for (i = sizeof(wmsk) - 1; i >= 0; i--) {
-                               shft = i * NBBY;
+                               shft = i * CHAR_BIT;
                                bmsk = (uint64_t)0xffLL << shft;
                                wmsk |= bmsk;
                                if ((*dst & wmsk) || i == 0)