mirror of
https://github.com/electron/electron.git
synced 2026-01-08 15:13:52 -05:00
54a617caab
* chore: bump node in DEPS to v24.11.1
* src: add a default branch for module phase
https://github.com/nodejs/node/pull/60261
* src: conditionally disable source phase imports by default
https://github.com/nodejs/node/pull/60364
* chore: update patches
* src: update locks to use DictionaryTemplate and other minor cleanups
https://github.com/nodejs/node/pull/60061
* deps: update simdjson to 4.0.7
https://github.com/nodejs/node/pull/59883
* test: move sea tests into test/sea
https://github.com/nodejs/node/pull/60250
* fixup deps: update simdjson to 4.0.7a
* src: conditionally disable source phase imports by default
https://github.com/nodejs/node/pull/60364
* module: handle null source from async loader hooks in sync hooks
https://github.com/nodejs/node/pull/59929
* Revert "src: conditionally disable source phase imports by default"
This reverts commit 5f85b84262.
* src: allow disabling JS source phase imports
https://github.com/nodejs/node/pull/60364
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
129 lines
3.8 KiB
Diff
129 lines
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Calvin Watford <cwatford@slack-corp.com>
|
|
Date: Thu, 28 Mar 2024 14:28:19 -0600
|
|
Subject: fix: remove deprecated errno constants
|
|
|
|
Various errno constants were deprecated by POSIX. libc++ added deprecation markers on these constants.
|
|
|
|
This change removes the usage of these constants to fix a compilation failure due to mappings of those constants. This patch should be upstreamed to node/libuv.
|
|
|
|
See: https://github.com/llvm/llvm-project/pull/80542
|
|
|
|
diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
|
|
index 0295eeddbb4eb1cffd9dbcd02e037907fadc1b7e..7c2f9d2a8b13584ff6b33cd3ff4745e9fb3c4170 100644
|
|
--- a/deps/uv/include/uv.h
|
|
+++ b/deps/uv/include/uv.h
|
|
@@ -156,7 +156,6 @@ struct uv__queue {
|
|
XX(EFTYPE, "inappropriate file type or format") \
|
|
XX(EILSEQ, "illegal byte sequence") \
|
|
XX(ESOCKTNOSUPPORT, "socket type not supported") \
|
|
- XX(ENODATA, "no data available") \
|
|
XX(EUNATCH, "protocol driver not attached") \
|
|
XX(ENOEXEC, "exec format error") \
|
|
|
|
diff --git a/deps/uv/include/uv/errno.h b/deps/uv/include/uv/errno.h
|
|
index ac00778cfc59fb55e361b24fc81a965a5e8f97e7..f0c4d6dfc9f03bee59e656b2da9ac325bced7b69 100644
|
|
--- a/deps/uv/include/uv/errno.h
|
|
+++ b/deps/uv/include/uv/errno.h
|
|
@@ -456,18 +456,6 @@
|
|
# define UV__ESOCKTNOSUPPORT (-4025)
|
|
#endif
|
|
|
|
-/* FreeBSD defines ENODATA in /usr/include/c++/v1/errno.h which is only visible
|
|
- * if C++ is being used. Define it directly to avoid problems when integrating
|
|
- * libuv in a C++ project.
|
|
- */
|
|
-#if defined(ENODATA) && !defined(_WIN32)
|
|
-# define UV__ENODATA UV__ERR(ENODATA)
|
|
-#elif defined(__FreeBSD__)
|
|
-# define UV__ENODATA (-9919)
|
|
-#else
|
|
-# define UV__ENODATA (-4024)
|
|
-#endif
|
|
-
|
|
#if defined(EUNATCH) && !defined(_WIN32)
|
|
# define UV__EUNATCH UV__ERR(EUNATCH)
|
|
#else
|
|
diff --git a/src/node_constants.cc b/src/node_constants.cc
|
|
index fd28e0904d05e24e8eeb74fa36abd9727699a649..fea0426496978c0003fe1481afcf93fc9c23edca 100644
|
|
--- a/src/node_constants.cc
|
|
+++ b/src/node_constants.cc
|
|
@@ -242,10 +242,6 @@ void DefineErrnoConstants(Local<Object> target) {
|
|
NODE_DEFINE_CONSTANT(target, ENOBUFS);
|
|
#endif
|
|
|
|
-#ifdef ENODATA
|
|
- NODE_DEFINE_CONSTANT(target, ENODATA);
|
|
-#endif
|
|
-
|
|
#ifdef ENODEV
|
|
NODE_DEFINE_CONSTANT(target, ENODEV);
|
|
#endif
|
|
@@ -282,14 +278,6 @@ void DefineErrnoConstants(Local<Object> target) {
|
|
NODE_DEFINE_CONSTANT(target, ENOSPC);
|
|
#endif
|
|
|
|
-#ifdef ENOSR
|
|
- NODE_DEFINE_CONSTANT(target, ENOSR);
|
|
-#endif
|
|
-
|
|
-#ifdef ENOSTR
|
|
- NODE_DEFINE_CONSTANT(target, ENOSTR);
|
|
-#endif
|
|
-
|
|
#ifdef ENOSYS
|
|
NODE_DEFINE_CONSTANT(target, ENOSYS);
|
|
#endif
|
|
@@ -370,10 +358,6 @@ void DefineErrnoConstants(Local<Object> target) {
|
|
NODE_DEFINE_CONSTANT(target, ESTALE);
|
|
#endif
|
|
|
|
-#ifdef ETIME
|
|
- NODE_DEFINE_CONSTANT(target, ETIME);
|
|
-#endif
|
|
-
|
|
#ifdef ETIMEDOUT
|
|
NODE_DEFINE_CONSTANT(target, ETIMEDOUT);
|
|
#endif
|
|
diff --git a/src/node_errors.cc b/src/node_errors.cc
|
|
index 552aa161636928fb646a97402988bc394ee987c1..15d78e3eca9693dc518ccb28fc7c02fa1372f34b 100644
|
|
--- a/src/node_errors.cc
|
|
+++ b/src/node_errors.cc
|
|
@@ -862,10 +862,6 @@ const char* errno_string(int errorno) {
|
|
ERRNO_CASE(ENOBUFS);
|
|
#endif
|
|
|
|
-#ifdef ENODATA
|
|
- ERRNO_CASE(ENODATA);
|
|
-#endif
|
|
-
|
|
#ifdef ENODEV
|
|
ERRNO_CASE(ENODEV);
|
|
#endif
|
|
@@ -904,14 +900,6 @@ const char* errno_string(int errorno) {
|
|
ERRNO_CASE(ENOSPC);
|
|
#endif
|
|
|
|
-#ifdef ENOSR
|
|
- ERRNO_CASE(ENOSR);
|
|
-#endif
|
|
-
|
|
-#ifdef ENOSTR
|
|
- ERRNO_CASE(ENOSTR);
|
|
-#endif
|
|
-
|
|
#ifdef ENOSYS
|
|
ERRNO_CASE(ENOSYS);
|
|
#endif
|
|
@@ -994,10 +982,6 @@ const char* errno_string(int errorno) {
|
|
ERRNO_CASE(ESTALE);
|
|
#endif
|
|
|
|
-#ifdef ETIME
|
|
- ERRNO_CASE(ETIME);
|
|
-#endif
|
|
-
|
|
#ifdef ETIMEDOUT
|
|
ERRNO_CASE(ETIMEDOUT);
|
|
#endif
|