popsbr.h: Rename to be alongside implementation.

[nmh] / test / getcwidth.c

diff --git a/test/getcwidth.c b/test/getcwidth.c
index a6c7391c96d03a412d6b12f7d0373b73e97f30d2..165f12ab0142036f01c8593cd2db05b380801905 100644 (file)
--- a/test/getcwidth.c
+++ b/test/getcwidth.c
@@ -1,5 +1,4 @@
-/*
- * getcwidth - Get the OS's idea of the width of Unicode codepoints
+/* getcwidth - Get the OS's idea of the width of Unicode codepoints
  *
  * This code is Copyright (c) 2013, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -164,9 +163,9 @@ typedef struct {
 static unicode_range range[] = {
        /* https://en.wikipedia.org/wiki/Unicode#Code_point_planes_and_blocks */
        {  L'\x0000',    L'\xff' },
-#if __WCHAR_MAX__ >= 0xffff
+#if WCHAR_MAX >= 0xffff
        {  L'\x0100',  L'\xffff' },
-#if __WCHAR_MAX__ >= 0xfffff
+#if WCHAR_MAX >= 0xfffff
        { L'\x10000', L'\x14fff' },
        { L'\x16000', L'\x18fff' },
        { L'\x1b000', L'\x1bfff' },