mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-07-02 02:51:42 +00:00
[upstream_utils] Update to libuv 1.47.0 (#5889)
This commit is contained in:
@@ -8,10 +8,10 @@ Subject: [PATCH 09/10] Remove static from array indices
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/unix/linux.c b/src/unix/linux.c
|
||||
index e3dfb186dc531e5c8197a81681c00d693e0913c6..d365b623a0a25228f0c6acf1fa14a5c7a9f1efbf 100644
|
||||
index b23d88bd824843eebc3b439e5a18e6f796a747be..95a2fe2b42895626f207f740bdccfe938915d836 100644
|
||||
--- a/src/unix/linux.c
|
||||
+++ b/src/unix/linux.c
|
||||
@@ -2060,7 +2060,7 @@ static uint64_t uv__read_uint64(const char* filename) {
|
||||
@@ -2104,7 +2104,7 @@ static uint64_t uv__read_uint64(const char* filename) {
|
||||
* finds the location and length of the memory controller mount path.
|
||||
* This disregards the leading / for easy concatenation of paths.
|
||||
* Returns NULL if the memory controller wasn't found. */
|
||||
@@ -20,7 +20,7 @@ index e3dfb186dc531e5c8197a81681c00d693e0913c6..d365b623a0a25228f0c6acf1fa14a5c7
|
||||
int* n) {
|
||||
char* p;
|
||||
|
||||
@@ -2081,7 +2081,7 @@ static char* uv__cgroup1_find_memory_controller(char buf[static 1024],
|
||||
@@ -2125,7 +2125,7 @@ static char* uv__cgroup1_find_memory_controller(char buf[static 1024],
|
||||
return p;
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ index e3dfb186dc531e5c8197a81681c00d693e0913c6..d365b623a0a25228f0c6acf1fa14a5c7
|
||||
uint64_t* max) {
|
||||
char filename[4097];
|
||||
char* p;
|
||||
@@ -2121,7 +2121,7 @@ update_limits:
|
||||
@@ -2165,7 +2165,7 @@ update_limits:
|
||||
*max = UINT64_MAX;
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ index e3dfb186dc531e5c8197a81681c00d693e0913c6..d365b623a0a25228f0c6acf1fa14a5c7
|
||||
uint64_t* max) {
|
||||
char filename[4097];
|
||||
char* p;
|
||||
@@ -2138,7 +2138,7 @@ static void uv__get_cgroup2_memory_limits(char buf[static 1024], uint64_t* high,
|
||||
@@ -2182,7 +2182,7 @@ static void uv__get_cgroup2_memory_limits(char buf[static 1024], uint64_t* high,
|
||||
*high = uv__read_uint64(filename);
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ index e3dfb186dc531e5c8197a81681c00d693e0913c6..d365b623a0a25228f0c6acf1fa14a5c7
|
||||
uint64_t high;
|
||||
uint64_t max;
|
||||
|
||||
@@ -2164,7 +2164,7 @@ uint64_t uv_get_constrained_memory(void) {
|
||||
@@ -2208,7 +2208,7 @@ uint64_t uv_get_constrained_memory(void) {
|
||||
}
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ index e3dfb186dc531e5c8197a81681c00d693e0913c6..d365b623a0a25228f0c6acf1fa14a5c7
|
||||
char filename[4097];
|
||||
uint64_t current;
|
||||
char* p;
|
||||
@@ -2188,7 +2188,7 @@ static uint64_t uv__get_cgroup1_current_memory(char buf[static 1024]) {
|
||||
@@ -2232,7 +2232,7 @@ static uint64_t uv__get_cgroup1_current_memory(char buf[static 1024]) {
|
||||
return uv__read_uint64("/sys/fs/cgroup/memory/memory.usage_in_bytes");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user