summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Utilities/cmlibuv/CMakeLists.txt2
-rw-r--r--Utilities/cmlibuv/src/unix/cmake-bootstrap.c2
-rw-r--r--Utilities/cmlibuv/src/unix/tty.c6
-rwxr-xr-xbootstrap3
4 files changed, 13 insertions, 0 deletions
diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index b815a5c..ad3d433 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -27,6 +27,8 @@ set(uv_sources
src/queue.h
src/strscpy.c
src/strscpy.h
+ src/strtok.c
+ src/strtok.h
src/threadpool.c
src/timer.c
src/uv-common.c
diff --git a/Utilities/cmlibuv/src/unix/cmake-bootstrap.c b/Utilities/cmlibuv/src/unix/cmake-bootstrap.c
index 0f279d5..394231d 100644
--- a/Utilities/cmlibuv/src/unix/cmake-bootstrap.c
+++ b/Utilities/cmlibuv/src/unix/cmake-bootstrap.c
@@ -135,7 +135,9 @@ int uv__statx(int dirfd,
errno = ENOSYS;
return -1;
}
+#endif
+#if defined(__linux__) || defined(__FreeBSD__)
ssize_t uv__fs_copy_file_range(int fd_in, off_t* off_in,
int fd_out, off_t* off_out,
size_t len, unsigned int flags)
diff --git a/Utilities/cmlibuv/src/unix/tty.c b/Utilities/cmlibuv/src/unix/tty.c
index 66e6bca..44fdb9c 100644
--- a/Utilities/cmlibuv/src/unix/tty.c
+++ b/Utilities/cmlibuv/src/unix/tty.c
@@ -62,6 +62,8 @@ static int isreallyatty(int file) {
#define isatty(fd) isreallyatty(fd)
#endif
+#if !defined(CMAKE_BOOTSTRAP)
+
static int orig_termios_fd = -1;
static struct termios orig_termios;
static uv_spinlock_t termios_spinlock = UV_SPINLOCK_INITIALIZER;
@@ -344,6 +346,7 @@ int uv_tty_get_winsize(uv_tty_t* tty, int* width, int* height) {
return 0;
}
+#endif
uv_handle_type uv_guess_handle(uv_file file) {
struct sockaddr_storage ss;
@@ -432,6 +435,7 @@ uv_handle_type uv_guess_handle(uv_file file) {
return UV_UNKNOWN_HANDLE;
}
+#if !defined(CMAKE_BOOTSTRAP)
/* This function is async signal-safe, meaning that it's safe to call from
* inside a signal handler _unless_ execution was inside uv_tty_set_mode()'s
@@ -461,3 +465,5 @@ void uv_tty_set_vterm_state(uv_tty_vtermstate_t state) {
int uv_tty_get_vterm_state(uv_tty_vtermstate_t* state) {
return UV_ENOTSUP;
}
+
+#endif
diff --git a/bootstrap b/bootstrap
index 9a87413..2de882c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -588,6 +588,7 @@ if ${cmake_system_mingw}; then
src/inet.c \
src/threadpool.c \
src/strscpy.c \
+ src/strtok.c \
src/timer.c \
src/uv-common.c \
src/win/async.c \
@@ -618,6 +619,7 @@ if ${cmake_system_mingw}; then
else
LIBUV_C_SOURCES="\
src/strscpy.c \
+ src/strtok.c \
src/timer.c \
src/uv-common.c \
src/unix/cmake-bootstrap.c \
@@ -634,6 +636,7 @@ else
src/unix/signal.c \
src/unix/stream.c \
src/unix/tcp.c \
+ src/unix/tty.c \
"
fi