From 135e9127b1a4dfe1d066d63b1829a52425bff218 Mon Sep 17 00:00:00 2001
From: vscosta <vsc@dcc.fc.up.pt>
Date: Mon, 10 Nov 2014 01:52:01 +0000
Subject: [PATCH] warnings

---
 library/regex/regcomp.c | 4 +++-
 library/regex/regexp.c  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/regex/regcomp.c b/library/regex/regcomp.c
index 3efc6a79e..ef3df12c6 100644
--- a/library/regex/regcomp.c
+++ b/library/regex/regcomp.c
@@ -77,10 +77,12 @@ unsigned char collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
 struct collate_st_char_pri collate_char_pri_table[UCHAR_MAX + 1];
 struct collate_st_chain_pri collate_chain_pri_table[TABLE_SIZE];
 
-#if _MSC_VER || defined(__MINGW32__) || defined(__CYGWIN__)
+#if __WINDOWS__
 #define isblank(X) isspace(X)
+#ifndef isascii
 #define isascii(X) ((unsigned int)(X) < 0177)
 #endif
+#endif
 
 /*
  * Compare two characters converting collate information
diff --git a/library/regex/regexp.c b/library/regex/regexp.c
index 6dd924d74..d48dac3c3 100644
--- a/library/regex/regexp.c
+++ b/library/regex/regexp.c
@@ -175,11 +175,11 @@ init_regexp(void)
   YAP_UserCPredicate("check_regexp", regexp, 7);
 }
 
-#if defined(_WIN32) || defined(__MINGW32__)
+#if __WINDOWS__
 
 #include <windows.h>
 
-int WINAPI winegexp(HANDLE, DWORD, LPVOID);
+int WINAPI win_regexp(HANDLE, DWORD, LPVOID);
 
 int WINAPI win_regexp(HANDLE hinst, DWORD reason, LPVOID reserved)
 {