Skip to content

Revert "[Runtime] Don't use <sys/errno.h>." #71917

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
wants to merge 2 commits into from
Closed

Revert "[Runtime] Don't use <sys/errno.h>." #71917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87d27b5
Revert "[Runtime] Don't use `<sys/errno.h>`."
ahoppen Feb 27, 2024
ba54579
DNM Just checking
ahoppen Feb 28, 2024
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: 4 additions & 0 deletions stdlib/public/CommandLineSupport/CommandLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
#include <cstring>
#include <string>

#if __has_include(<sys/errno.h>)
#include <sys/errno.h>
#else
#include <errno.h>
#endif

#include "swift/Runtime/Debug.h"
#include "swift/Runtime/Win32.h"
Expand Down
4 changes: 4 additions & 0 deletions stdlib/public/stubs/Stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
#define NOMINMAX
#include <windows.h>
#else // defined(_WIN32)
#if __has_include(<sys/errno.h>)
#include <sys/errno.h>
#else
#include <errno.h>
#endif
#if __has_include(<sys/resource.h>)
#include <sys/resource.h>
#endif
Expand Down
34 changes: 17 additions & 17 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,10 +845,10 @@ test-installable-package
toolchain-benchmarks

# Path to the root of the installation filesystem.
install-destdir=%(install_destdir)s
install-destdir=/home/build-user/swift-nightly-install

# Path to the .tar.gz package we would create.
installable-package=%(installable_package)s
installable-package=/home/build-user/swift-DEVELOPMENT-SNAPSHOT-2024-02-27-a-amazonlinux2.tar.gz

# This ensures the default module cache
# location is local to this run, allowing
Expand Down Expand Up @@ -911,21 +911,21 @@ no-assertions


[preset: mixin_buildbot_linux,no_test]
skip-test-cmark
skip-test-lldb
skip-test-swift
skip-test-llbuild
skip-test-swiftpm
skip-test-swift-driver
skip-test-xctest
skip-test-foundation
skip-test-libdispatch
skip-test-playgroundsupport
skip-test-libicu
skip-test-indexstore-db
skip-test-sourcekit-lsp
skip-test-swiftdocc
skip-test-wasm-stdlib
; skip-test-cmark
; skip-test-lldb
; skip-test-swift
; skip-test-llbuild
; skip-test-swiftpm
; skip-test-swift-driver
; skip-test-xctest
; skip-test-foundation
; skip-test-libdispatch
; skip-test-playgroundsupport
; skip-test-libicu
; skip-test-indexstore-db
; skip-test-sourcekit-lsp
; skip-test-swiftdocc
; skip-test-wasm-stdlib

# Linux package with out test
[preset: buildbot_linux,no_test]
Expand Down