From cec13949ff7544f3ebadde2bff0cf242df57bfc0 Mon Sep 17 00:00:00 2001 From: Amr Aboelela Date: Thu, 1 Jun 2017 15:27:46 -0700 Subject: [PATCH 1/2] Removed && !defined(__ANDROID__) --- stdlib/public/SwiftShims/LibcShims.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/public/SwiftShims/LibcShims.h b/stdlib/public/SwiftShims/LibcShims.h index 7745ed0f03ef1..fe7dbbaeca14d 100644 --- a/stdlib/public/SwiftShims/LibcShims.h +++ b/stdlib/public/SwiftShims/LibcShims.h @@ -33,7 +33,7 @@ namespace swift { extern "C" { // This declaration is not universally correct. We verify its correctness for // the current platform in the runtime code. -#if defined(__linux__) && defined (__arm__) && !defined(__ANDROID__) +#if defined(__linux__) && defined (__arm__) typedef int __swift_ssize_t; #elif defined(_WIN32) #if defined(_M_ARM) || defined(_M_IX86) From c659c1478f373e6111f49a995e2a6ce35690be5c Mon Sep 17 00:00:00 2001 From: Amr Aboelela Date: Thu, 1 Jun 2017 15:51:41 -0700 Subject: [PATCH 2/2] This PR is a fix for https://bugs.swift.org/browse/SR-5059 --- stdlib/public/SwiftShims/LibcShims.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/public/SwiftShims/LibcShims.h b/stdlib/public/SwiftShims/LibcShims.h index fe7dbbaeca14d..41853faf7a745 100644 --- a/stdlib/public/SwiftShims/LibcShims.h +++ b/stdlib/public/SwiftShims/LibcShims.h @@ -33,7 +33,7 @@ namespace swift { extern "C" { // This declaration is not universally correct. We verify its correctness for // the current platform in the runtime code. -#if defined(__linux__) && defined (__arm__) +#if defined(__linux__) && defined (__arm__) typedef int __swift_ssize_t; #elif defined(_WIN32) #if defined(_M_ARM) || defined(_M_IX86)