From 8c974e7b773f1fa746055484c77e0ca40684bd6c Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Mon, 13 Jun 2016 21:47:04 -0400
Subject: [PATCH] Started removing intmax_ts, first with uipriv_windows.hpp.

---
 windows/tabpage.cpp        | 2 +-
 windows/uipriv_windows.hpp | 6 +++---
 windows/utf16.cpp          | 2 +-
 windows/winutil.cpp        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/windows/tabpage.cpp b/windows/tabpage.cpp
index 7f95071d..5283ce79 100644
--- a/windows/tabpage.cpp
+++ b/windows/tabpage.cpp
@@ -117,7 +117,7 @@ void tabPageDestroy(struct tabPage *tp)
 	uiFree(tp);
 }
 
-void tabPageMinimumSize(struct tabPage *tp, intmax_t *width, intmax_t *height)
+void tabPageMinimumSize(struct tabPage *tp, int *width, int *height)
 {
 	int mx, my;
 
diff --git a/windows/uipriv_windows.hpp b/windows/uipriv_windows.hpp
index d33203f3..6ffe09f1 100644
--- a/windows/uipriv_windows.hpp
+++ b/windows/uipriv_windows.hpp
@@ -38,7 +38,7 @@ extern WCHAR *vstrf(const WCHAR *format, va_list ap);
 extern char *LFtoCRLF(const char *lfonly);
 extern void CRLFtoLF(char *s);
 extern WCHAR *ftoutf16(double d);
-extern WCHAR *itoutf16(intmax_t i);
+extern WCHAR *itoutf16(int i);
 
 // debug.cpp
 // see http://stackoverflow.com/questions/14421656/is-there-widely-available-wide-character-variant-of-file
@@ -69,7 +69,7 @@ extern DWORD getStyle(HWND hwnd);
 extern void setStyle(HWND hwnd, DWORD style);
 extern DWORD getExStyle(HWND hwnd);
 extern void setExStyle(HWND hwnd, DWORD exstyle);
-extern void clientSizeToWindowSize(HWND hwnd, intmax_t *width, intmax_t *height, BOOL hasMenubar);
+extern void clientSizeToWindowSize(HWND hwnd, int *width, int *height, BOOL hasMenubar);
 extern HWND parentOf(HWND child);
 extern HWND parentToplevel(HWND child);
 extern void setWindowInsertAfter(HWND hwnd, HWND insertAfter);
@@ -134,7 +134,7 @@ struct tabPage {
 };
 extern struct tabPage *newTabPage(uiControl *child);
 extern void tabPageDestroy(struct tabPage *tp);
-extern void tabPageMinimumSize(struct tabPage *tp, intmax_t *width, intmax_t *height);
+extern void tabPageMinimumSize(struct tabPage *tp, int *width, int *height);
 
 // colordialog.cpp
 struct colorDialogRGBA {
diff --git a/windows/utf16.cpp b/windows/utf16.cpp
index 9acc5e82..98954d0a 100644
--- a/windows/utf16.cpp
+++ b/windows/utf16.cpp
@@ -142,7 +142,7 @@ WCHAR *ftoutf16(double d)
 }
 
 // to complement the above
-WCHAR *itoutf16(intmax_t i)
+WCHAR *itoutf16(int i)
 {
 	std::wostringstream ss;
 	std::wstring s;
diff --git a/windows/winutil.cpp b/windows/winutil.cpp
index 7f7716ac..507c5a3f 100644
--- a/windows/winutil.cpp
+++ b/windows/winutil.cpp
@@ -77,7 +77,7 @@ void setExStyle(HWND hwnd, DWORD exstyle)
 }
 
 // see http://blogs.msdn.com/b/oldnewthing/archive/2003/09/11/54885.aspx and http://blogs.msdn.com/b/oldnewthing/archive/2003/09/13/54917.aspx
-void clientSizeToWindowSize(HWND hwnd, intmax_t *width, intmax_t *height, BOOL hasMenubar)
+void clientSizeToWindowSize(HWND hwnd, int *width, int *height, BOOL hasMenubar)
 {
 	RECT window;