[[ VS2015 ]] Ensure skia builds under VS2015

This patch ensures that skia builds using VS2015. It replaces a
bespoke header file defining standard integer types with an include
for stdint.h and tweaks to thread related primitives.

Author: runrevmark

libskia/include/config/sk_stdint.h

@@ -1,47 +1 @@
-#ifndef sk_stdint_DEFINED
-#define sk_stdint_DEFINED
-
-#ifndef WIN32
 #include <stdint.h>
-#else
-
-typedef signed char int8_t;
-typedef unsigned char   uint8_t;
-typedef short  int16_t;
-typedef unsigned short  uint16_t;
-typedef int  int32_t;
-typedef unsigned   uint32_t;
-// MDW-2014-04-05: [[ x64 ]] check 64-bitness before defining
-#ifdef __LP64__
-	typedef long  int64_t;
-	typedef unsigned long   uint64_t;
-#else
-	typedef long long  int64_t;
-	typedef unsigned long long   uint64_t;
-#endif
-
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-#ifndef _UINTPTR_T
-    #define _UINTPTR_T
-    // MDW-2013-04-15: [[ x64 ]] make 64-bit safe
-    #ifdef __LP64__
-        typedef uint64_t uintptr_t;
-    #else
-        typedef uint32_t uintptr_t;
-    #endif
-#endif
-
-#ifndef _INTPTR_T
-    #define _INTPTR_T
-    // MDW-2013-04-15: [[ x64 ]] make 64-bit safe
-    #ifdef __LP64__
-        typedef int64_t intptr_t;
-    #else
-        typedef int32_t intptr_t;
-    #endif
-#endif
-#endif
-
-#endif

libskia/src/core/SkOnce.h

@@ -32,10 +32,10 @@
 #ifdef SK_USE_POSIX_THREADS
 #  define SK_ONCE_INIT { false, { PTHREAD_MUTEX_INITIALIZER } }
 #else
-#  define SK_ONCE_INIT { false, SkBaseMutex() }
+#  define SK_ONCE_INIT {}
 #endif
 
-#define SK_DECLARE_STATIC_ONCE(name) static SkOnceFlag name = SK_ONCE_INIT
+#define SK_DECLARE_STATIC_ONCE(name) static SkOnceFlag name SK_ONCE_INIT
 
 struct SkOnceFlag;  // If manually created, initialize with SkOnceFlag once = SK_ONCE_INIT
 
@@ -45,6 +45,7 @@ inline void SkOnce(SkOnceFlag* once, Func f, Arg arg);
 //  ----------------------  Implementation details below here. -----------------------------
 
 struct SkOnceFlag {
+	SkOnceFlag() : done(false), mutex() {}
     bool done;
     SkBaseMutex mutex;
 };

libskia/src/core/SkString.cpp

@@ -17,14 +17,8 @@
 // number of bytes (on the stack) to receive the printf result
 static const size_t kBufferSize = 1024;
 
-#ifdef SK_BUILD_FOR_WIN
-    #define VSNPRINTF(buffer, size, format, args) \
-        _vsnprintf_s(buffer, size, _TRUNCATE, format, args)
-    #define SNPRINTF    _snprintf
-#else
-    #define VSNPRINTF   vsnprintf
-    #define SNPRINTF    snprintf
-#endif
+#define VSNPRINTF   vsnprintf
+#define SNPRINTF    snprintf
 
 #define ARGS_TO_BUFFER(format, buffer, size)        \
     do {                                            \