From ba030a329372d495c793b2870a32441da1cd20af Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Thu, 26 Aug 2021 05:36:43 -0400
Subject: [PATCH] Windows: kill some warnings

---
 include/notcurses/ncport.h | 10 +++++-----
 src/fetch/main.c           |  1 -
 src/poc/ncwidth.c          |  4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/notcurses/ncport.h b/include/notcurses/ncport.h
index 787a8fa45..431469df7 100644
--- a/include/notcurses/ncport.h
+++ b/include/notcurses/ncport.h
@@ -26,13 +26,13 @@ extern "C" {
 #include <string.h>
 #include <byteswap.h>
 #define htole(x) (__bswap_32(htonl(x)))
-#define wcwidth(w) 1               // FIXME lol, no
-#define wcswidth(w, s) (wcslen(w)) // FIXME lol, no
+#define wcwidth(w) 1 // FIXME lol, no
+#define wcswidth(w, s) (int)(wcslen(w)) // FIXME lol, no
 #elif defined(__MINGW64__)                        // Windows
 #include <string.h>
-#define wcwidth(w) 1               // FIXME lol, no
-#define wcswidth(w, s) (wcslen(w)) // FIXME lol, no
-#define htole(x) (x)       // FIXME are all windows installs LE? ugh
+#define wcwidth(w) 1 // FIXME lol, no
+#define wcswidth(w, s) (int)(wcslen(w)) // FIXME lol, no
+#define htole(x) (x) // FIXME are all windows installs LE? ugh
 #else                                             // BSDs
 #include <sys/endian.h>
 #define htole(x) (bswap32(htonl(x)))
diff --git a/src/fetch/main.c b/src/fetch/main.c
index acd0e3ed9..42fe8e8d8 100644
--- a/src/fetch/main.c
+++ b/src/fetch/main.c
@@ -14,7 +14,6 @@
 #include <sys/sysctl.h>
 #include <sys/utsname.h>
 #else
-#include <windows.h>
 #include <sysinfoapi.h>
 #endif
 #include <notcurses/notcurses.h>
diff --git a/src/poc/ncwidth.c b/src/poc/ncwidth.c
index 12c87dcd3..109be7396 100644
--- a/src/poc/ncwidth.c
+++ b/src/poc/ncwidth.c
@@ -81,8 +81,8 @@ int main(int argc, char **argv){
     fflush(stdout);
     ncdirect_cursor_yx(n, &newy, &newx);
     int realcols = (newx - x) + ncdirect_dim_x(n) * (newy - y);
-    printf("\n iterated wcwidth: %d total bytes: %zu wcswidth: %d true width: %d\n\n",
-           totalcols, totalb, wcswidth(wbuf, used), realcols);
+    printf("\n iterated wcwidth: %d total bytes: %llu wcswidth: %d true width: %d\n\n",
+           totalcols, (unsigned long long)totalb, wcswidth(wbuf, used), realcols);
     ncdirect_cursor_yx(n, &y, &x);
     // throw up a background color for invisible glyphs
     uint64_t chan = NCCHANNELS_INITIALIZER(0xff, 0xff, 0xff, 0, 0x80, 0);