From 03481304364535b3cc699762b0f13c9dcafff5d5 Mon Sep 17 00:00:00 2001
From: Nathan Houghton <nathan@brainwerk.org>
Date: Sat, 15 Oct 2016 18:10:52 -0700
Subject: [PATCH] Fix a few compile errors in more recent mingw32 build

---
 make.def      | 2 +-
 pib/psout.c   | 1 -
 tools/chars.h | 6 ------
 tools/files.h | 4 ++++
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/make.def b/make.def
index 22f85b2b..e4cb1b95 100755
--- a/make.def
+++ b/make.def
@@ -13,7 +13,7 @@
 
 # Ubuntu
 #TOOLPATH=/usr/bin/
-#CROSS=$(TOOLPATH)/i586-mingw32msvc-
+#CROSS=$(TOOLPATH)/i686-w64-mingw32-
 
 # OpenBSD
 #TOOLPATH=/usr/local/mingw32/bin/
diff --git a/pib/psout.c b/pib/psout.c
index b9f8fb9c..0549bf40 100644
--- a/pib/psout.c
+++ b/pib/psout.c
@@ -65,7 +65,6 @@
 
 #include "../tools/getoptv.h"
 #include "../tools/number.h"
-#include "../tools/chars.h"
 #include "../tools/types.h"
 #include "../tools/error.h"
 #include "../tools/files.h"
diff --git a/tools/chars.h b/tools/chars.h
index 6bedf581..19d55810 100644
--- a/tools/chars.h
+++ b/tools/chars.h
@@ -15,12 +15,6 @@
  *
  *--------------------------------------------------------------------*/
 
-#ifndef isblank
-#ifndef __CYGWIN__
-#define isblank(c) ((char)(c) == ' ') || ((char)(c) == '\t')
-#endif
-#endif
-
 #ifndef nobreak
 #define nobreak(c) ((char)(c) != '\n') && ((int)(c) != EOF)
 #endif
diff --git a/tools/files.h b/tools/files.h
index 11dddadb..8bc62d3f 100644
--- a/tools/files.h
+++ b/tools/files.h
@@ -62,8 +62,12 @@
 
 #ifdef WIN32
 #define FILE_FILEMODE S_IREAD|S_IWRITE
+#ifndef S_IRGRP
 #define S_IRGRP 0
+#endif
+#ifndef S_IROTH
 #define S_IROTH 0
+#endif
 #else
 #define FILE_FILEMODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH
 #define O_BINARY 0