From 154c64a454394b4db056eaa3cf2a80d2e4612f8f Mon Sep 17 00:00:00 2001
From: Benjamin Runnels <kraven@kraven.org>
Date: Sat, 9 Apr 2016 15:51:12 -0500
Subject: [PATCH] windows and visual studio fixes and updates

---
 esp-link.vcxproj             |  3 ++-
 include/c_types.h            | 17 ++++++++---------
 include/espmissingincludes.h |  3 ---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/esp-link.vcxproj b/esp-link.vcxproj
index 4a1ef3a..9b50cfc 100644
--- a/esp-link.vcxproj
+++ b/esp-link.vcxproj
@@ -72,6 +72,7 @@
     <ClInclude Include="httpd\base64.h" />
     <ClInclude Include="httpd\httpd.h" />
     <ClInclude Include="httpd\httpdespfs.h" />
+    <ClInclude Include="include\c_types.h" />
     <ClInclude Include="include\esp8266.h" />
     <ClInclude Include="include\espmissingincludes.h" />
     <ClInclude Include="include\uart_hw.h" />
@@ -140,7 +141,7 @@
   <PropertyGroup>
     <NMakeOutput />
     <NMakePreprocessorDefinitions>__ets__;_STDINT_H;ICACHE_FLASH;__MINGW32__;__WIN32__;MQTT;REST;SYSLOG;FIRMWARE_SIZE</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath>.\syslog;.\rest;.\esp-link;.\mqtt;.\cmd;.\serial;.\user;.\espfs;.\httpd;.\include;..\esp_iot_sdk_v1.5.0\include;..\xtensa-lx106-elf\xtensa-lx106-elf\include;c:\tools\mingw64\x86_64-w64-mingw32\include;c:\tools\mingw64\lib\gcc\x86_64-w64-mingw32\4.8.3\include</NMakeIncludeSearchPath>
+    <NMakeIncludeSearchPath>.\syslog;.\rest;.\esp-link;.\mqtt;.\cmd;.\serial;.\user;.\espfs;.\httpd;.\include;..\esp_iot_sdk_v1.5.2\include;..\xtensa-lx106-elf\xtensa-lx106-elf\include;c:\tools\mingw64\x86_64-w64-mingw32\include;c:\tools\mingw64\lib\gcc\x86_64-w64-mingw32\4.8.3\include</NMakeIncludeSearchPath>
     <ExecutablePath />
     <ReferencePath />
     <LibraryPath />
diff --git a/include/c_types.h b/include/c_types.h
index 6c4cfbd..673519b 100644
--- a/include/c_types.h
+++ b/include/c_types.h
@@ -12,20 +12,19 @@
 #ifndef _C_TYPES_H_
 #define _C_TYPES_H_
 
-#include <stdint.h>
 #include <stdbool.h>
 
-//typedef unsigned char       uint8_t;
+typedef unsigned char       uint8_t;
 typedef signed char         sint8_t;
-//typedef signed char         int8_t;
-//typedef unsigned short      uint16_t;
+typedef signed char         int8_t;
+typedef unsigned short      uint16_t;
 typedef signed short        sint16_t;
-//typedef signed short        int16_t;
-//typedef unsigned long       uint32_t;
-typedef signed long         sint32_t;
-//typedef signed long         int32_t;
+typedef signed short        int16_t;
+typedef unsigned int        uint32_t;
+typedef signed int          sint32_t;
+typedef signed int          int32_t;
 typedef signed long long    sint64_t;
-//typedef unsigned long long  uint64_t;
+typedef unsigned long long  uint64_t;
 typedef unsigned long long  u_int64_t;
 typedef float               real32_t;
 typedef double              real64_t;
diff --git a/include/espmissingincludes.h b/include/espmissingincludes.h
index 2c35965..cdc15dd 100644
--- a/include/espmissingincludes.h
+++ b/include/espmissingincludes.h
@@ -3,9 +3,6 @@
 
 #include <user_interface.h>
 #include <eagle_soc.h>
-#include <stdint.h>
-#include <c_types.h>
-#include <ets_sys.h>
 #include <stdarg.h>
 
 //Missing function prototypes in include folders. Gcc will warn on these if we don't define 'em anywhere.