Skip to content

[stdlib] Rename "PrivateDarwin" to "PrivateLibc" #1395

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

Merged
merged 1 commit into from
Feb 22, 2016
Merged

[stdlib] Rename "PrivateDarwin" to "PrivateLibc" #1395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions stdlib/private/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_subdirectory(StdlibUnittest)
add_subdirectory(StdlibCollectionUnittest)
add_subdirectory(StdlibUnittestFoundationExtras)
add_subdirectory(SwiftPrivateDarwinExtras)
add_subdirectory(SwiftPrivateLibcExtras)
add_subdirectory(SwiftPrivatePthreadExtras)
endif()
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
add_subdirectory(StdlibUnittest)
add_subdirectory(StdlibCollectionUnittest)
add_subdirectory(SwiftPrivateDarwinExtras)
add_subdirectory(SwiftPrivateLibcExtras)
add_subdirectory(SwiftPrivatePthreadExtras)
endif()
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(swift_stdlib_unittest_platform_sources)
set(swift_stdlib_unittest_module_depends
SwiftPrivate SwiftPrivatePthreadExtras SwiftPrivateDarwinExtras)
SwiftPrivate SwiftPrivatePthreadExtras SwiftPrivateLibcExtras)
set(swift_stdlib_unittest_framework_depends)
set(swift_stdlib_unittest_private_link_libraries)
set(swift_stdlib_unittest_compile_flags)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//

import SwiftPrivate
import SwiftPrivateDarwinExtras
import SwiftPrivateLibcExtras
#if os(OSX) || os(iOS)
import Darwin
#elseif os(Linux) || os(FreeBSD)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import SwiftPrivate
import SwiftPrivatePthreadExtras
import SwiftPrivateDarwinExtras
import SwiftPrivateLibcExtras

#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
import Darwin
Expand Down
4 changes: 2 additions & 2 deletions ...e/SwiftPrivateDarwinExtras/CMakeLists.txt → ...ate/SwiftPrivateLibcExtras/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ elseif(SWIFT_HOST_VARIANT STREQUAL "linux" OR SWIFT_HOST_VARIANT STREQUAL "freeb
Glibc)
endif()

add_swift_library(swiftSwiftPrivateDarwinExtras SHARED IS_STDLIB
add_swift_library(swiftSwiftPrivateLibcExtras SHARED IS_STDLIB
# This file should be listed the first. Module name is inferred from the
# filename.
SwiftPrivateDarwinExtras.swift
SwiftPrivateLibcExtras.swift
Subprocess.swift

SWIFT_MODULE_DEPENDS ${swift_private_darwin_extras_module_depends}
Expand Down
0 ...SwiftPrivateDarwinExtras/Subprocess.swift → ...e/SwiftPrivateLibcExtras/Subprocess.swift
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rwinExtras/SwiftPrivateDarwinExtras.swift → ...teLibcExtras/SwiftPrivateLibcExtras.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===--- SwiftPrivateDarwinExtras.swift -----------------------------------===//
//===--- SwiftPrivateLibcExtras.swift -----------------------------------===//
//
// This source file is part of the Swift.org open source project
//
Expand Down