Skip to content

Removed && !defined(__ANDROID__) #10045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amraboelela wants to merge 4 commits into from
Closed

Removed && !defined(__ANDROID__) #10045

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cec1394
Removed && !defined(__ANDROID__)
amraboelela Jun 1, 2017
edb18cf
Merge remote-tracking branch 'apple/master' into remove-android-define
amraboelela Jun 1, 2017
c659c14
This PR is a fix for https://bugs.swift.org/browse/SR-5059
amraboelela Jun 1, 2017
c80e383
Merge remote-tracking branch 'apple/master' into remove-android-define
amraboelela Jun 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stdlib/public/SwiftShims/LibcShims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down