Merge pull request #3211 from compnerd/windows-stubs

swift-ci · web-flow · commit 027069b8c1b8 · 2016-06-27T23:08:17.000-07:00
diff --git a/stdlib/public/stubs/LibcShims.cpp b/stdlib/public/stubs/LibcShims.cpp
@@ -93,7 +93,7 @@ size_t swift::_swift_stdlib_malloc_size(const void *ptr) {
 }
 #elif defined(_MSC_VER)
 #include <malloc.h>
-size_t _swift_stdlib_malloc_size(const void *ptr) {
+size_t swift::_swift_stdlib_malloc_size(const void *ptr) {
   return _msize(const_cast<void *>(ptr));
 }
 #elif defined(__FreeBSD__)
diff --git a/stdlib/public/stubs/UnicodeExtendedGraphemeClusters.cpp.gyb b/stdlib/public/stubs/UnicodeExtendedGraphemeClusters.cpp.gyb
@@ -131,6 +131,7 @@ const uint16_t _swift_stdlib_ExtendedGraphemeClusterNoBoundaryRulesMatrixImpl[]
 % end
 };
 
+extern "C"
 SWIFT_RUNTIME_STDLIB_INTERFACE
 const uint16_t *_swift_stdlib_ExtendedGraphemeClusterNoBoundaryRulesMatrix =
     _swift_stdlib_ExtendedGraphemeClusterNoBoundaryRulesMatrixImpl;

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ size_t swift::_swift_stdlib_malloc_size(const void *ptr) {`
`93`	`93`	`}`
`94`	`94`	`#elif defined(_MSC_VER)`
`95`	`95`	`#include <malloc.h>`
`96`		`-size_t _swift_stdlib_malloc_size(const void *ptr) {`
	`96`	`+size_t swift::_swift_stdlib_malloc_size(const void *ptr) {`
`97`	`97`	`return _msize(const_cast<void *>(ptr));`
`98`	`98`	`}`
`99`	`99`	`#elif defined(__FreeBSD__)`