Skip to content

Commit c057cd8

Browse files
committed
Changes required for Android port
1 parent c881a7c commit c057cd8

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@
2727
#include <CoreFoundation/ForFoundationOnly.h>
2828
#include <fts.h>
2929
#include <pthread.h>
30-
#ifndef __ANDROID__
31-
#include <execinfo.h>
32-
#endif
3330

34-
#if __has_include(<malloc/malloc.h>)
35-
#include <malloc/malloc.h>
31+
#if __has_include(<execinfo.h>)
32+
#include <execinfo.h>
3633
#endif
3734

3835
#if __has_include(<malloc/malloc.h>)

Foundation/NSObject.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
@_exported import Dispatch
1414

1515
import CoreFoundation
16-
@_exported import Dispatch
1716

1817
/// The `NSObjectProtocol` groups methods that are fundamental to all Foundation objects.
1918
///

Foundation/URLSession/http/EasyHandle.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ internal protocol _EasyHandleDelegate: class {
104104
/// - returns: the number of bytes written to the `data` buffer, or `nil` to stop the current transfer immediately.
105105
func fill(writeBuffer buffer: UnsafeMutableBufferPointer<Int8>) -> _EasyHandle._WriteBufferResult
106106
/// The transfer for this handle completed.
107-
/// - parameter errorCode: An NSURLError code, or `nil` if no error occured.
107+
/// - parameter error: An NSError, or `nil` if no error occured.
108108
func transferCompleted(withError error: NSError?)
109109
/// Seek the input stream to the given position
110110
func seekInputStream(to position: UInt64) throws

0 commit comments

Comments
 (0)