Merge branch 'master' of https://github.com/rwhitworth/stb into working

Conflicts:
	stb.h

stb.h

@@ -184,7 +184,7 @@ Fixes:
  r-lyeh
  blackpawn
  Mojofreem@github
-
+ Ryan Whitworth
 */
 
 #ifndef STB__INCLUDE_STB_H
@@ -205,6 +205,15 @@ Fixes:
    #endif
 #endif
 
+#ifdef _WIN32
+   #define _CRT_SECURE_NO_WARNINGS
+   #define _CRT_NONSTDC_NO_DEPRECATE
+   #define _CRT_NON_CONFORMING_SWPRINTFS
+   #if !defined(_MSC_VER) || _MSC_VER > 1700
+   #include <intrin.h> // _BitScanReverse
+   #endif
+#endif
+
 #include <stdlib.h>     // stdlib could have min/max
 #include <stdio.h>      // need FILE
 #include <string.h>     // stb_define_hash needs memcpy/memset
@@ -1429,7 +1438,7 @@ int stb_is_pow2(unsigned int n)
 int stb_log2_floor(unsigned int n)
 {
    #if _MSC_VER > 1700
-   unsigned int i;
+   unsigned long i;
    _BitScanReverse(&i, n);
    return i != 0 ? i : -1;
    #else

stb_easy_font.h

@@ -94,6 +94,7 @@ void print_string(float x, float y, char *text, float r, float g, float b)
 #define INCLUDE_STB_EASY_FONT_H
 
 #include <stdlib.h>
+#include <math.h>
 
 struct {
     unsigned char advance;

stb_leakcheck.h

@@ -15,6 +15,8 @@
 #undef realloc
 #endif
 
+#include <assert.h>
+#include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>

stb_tilemap_editor.h

@@ -326,6 +326,12 @@
 #ifndef STB_TILEMAP_INCLUDE_STB_TILEMAP_EDITOR_H
 #define STB_TILEMAP_INCLUDE_STB_TILEMAP_EDITOR_H
 
+#ifdef _WIN32
+  #define _CRT_SECURE_NO_WARNINGS
+  #include <stdlib.h>
+  #include <stdio.h>
+#endif
+
 typedef struct stbte_tilemap stbte_tilemap;
 
 // these are the drawmodes used in STBTE_DRAW_TILE