From 2f9da92e4819f03408412dc77fe77f7c2fd96284 Mon Sep 17 00:00:00 2001
From: OndraCo <OndraCo@gmail.com>
Date: Fri, 6 May 2016 07:50:17 +0800
Subject: [PATCH] Changes to enable WIN CE support

---
 changelog                   | 1 +
 lib/libwebsockets.h         | 5 +++--
 lib/lws-plat-win.c          | 5 ++++-
 lib/private-libwebsockets.h | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 7b1b536..be73991 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ Fixes
 
 2) Fix IPV6 build breakage
 
+3) Some fixes for WinCE build
 
 
 v2.0.0
diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
index 82ed98d..d0cdfb6 100644
--- a/lib/libwebsockets.h
+++ b/lib/libwebsockets.h
@@ -112,16 +112,17 @@ struct sockaddr_in;
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <basetsd.h>
 #ifndef _WIN32_WCE
+#include <stdint.h>
 #include <fcntl.h>
 #else
 #define _O_RDONLY	0x0000
 #define O_RDONLY	_O_RDONLY
 #endif
 
-#ifdef _WIN32_WCE
+// Visual studio older than 2015 and WIN_CE has only _stricmp
+#if (defined(_MSC_VER) && _MSC_VER < 1900) || defined(_WIN32_WCE)
 #define strcasecmp _stricmp
 #else
 #define strcasecmp stricmp
diff --git a/lib/lws-plat-win.c b/lib/lws-plat-win.c
index dd3e95a..842423b 100644
--- a/lib/lws-plat-win.c
+++ b/lib/lws-plat-win.c
@@ -31,7 +31,10 @@ time_in_microseconds()
 time_t time(time_t *t)
 {
 	time_t ret = time_in_microseconds() / 1000000;
-	*t = ret;
+
+	if(t != NULL)
+		*t = ret;
+
 	return ret;
 }
 #endif
diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
index 23f8f4d..9ef1994 100644
--- a/lib/private-libwebsockets.h
+++ b/lib/private-libwebsockets.h
@@ -87,7 +87,7 @@
 #define __func__ __FUNCTION__
 #endif
 
-#ifdef _WIN32_WCE
+#if defined(_MSC_VER) || defined(_WIN32_WCE)
 #define vsnprintf _vsnprintf
 #else
 #ifdef LWS_HAVE__VSNPRINTF
-- 
2.7.4