Skip to content

Commit 1124863

Browse files
authored
Merge pull request #2355 from compnerd/over-and-under-and-poof
Foundation: remove & overload for android
2 parents ef19b4f + 921f8e4 commit 1124863

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

Foundation/FileManager+POSIX.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
#if !os(Windows)
99

10-
#if os(Android) // struct stat.st_mode is UInt32
10+
#if os(Android) && (arch(i386) || arch(arm)) // struct stat.st_mode is UInt32
1111
internal func &(left: UInt32, right: mode_t) -> mode_t {
1212
return mode_t(left) & right
1313
}

Foundation/FileManager.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
88
//
99

10-
#if os(Android) // struct stat.st_mode is UInt32
11-
internal func &(left: UInt32, right: mode_t) -> mode_t {
12-
return mode_t(left) & right
13-
}
14-
#endif
15-
1610
#if !canImport(Darwin) && !os(FreeBSD)
1711
// The values do not matter as long as they are nonzero.
1812
fileprivate let UF_IMMUTABLE: Int32 = 1

0 commit comments

Comments
 (0)