forked from wpilibsuite/allwpilib
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[upstream_utils] Revert removal of uv_clock_gettime()
GetSystemTimePreciseAsFileTime() is supposed to be available, and wpiutil already uses it.
- Loading branch information
Showing
6 changed files
with
74 additions
and
81 deletions.
There are no files selected for viewing
40 changes: 40 additions & 0 deletions
40
upstream_utils/libuv_patches/0010-Add-pragmas-for-missing-libraries-and-set-_WIN32_WIN.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Tyler Veness <[email protected]> | ||
Date: Fri, 14 Jul 2023 16:40:18 -0700 | ||
Subject: [PATCH 10/10] Add pragmas for missing libraries and set _WIN32_WINNT | ||
to Windows 10 | ||
|
||
See | ||
https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt. | ||
--- | ||
include/uv/win.h | 2 +- | ||
src/win/util.c | 2 ++ | ||
2 files changed, 3 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/include/uv/win.h b/include/uv/win.h | ||
index 6d0afe69e7dd4caf4c9459e548fe75cf0c51b501..613065df435d813cd517efbc138b13ee46f01f2d 100644 | ||
--- a/include/uv/win.h | ||
+++ b/include/uv/win.h | ||
@@ -20,7 +20,7 @@ | ||
*/ | ||
|
||
#ifndef _WIN32_WINNT | ||
-# define _WIN32_WINNT 0x0600 | ||
+# define _WIN32_WINNT 0x0A00 | ||
#endif | ||
|
||
#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) | ||
diff --git a/src/win/util.c b/src/win/util.c | ||
index 9324992ec521cc3496e3e9304e600963a3f20897..4b76417fcbac2480725471740c037deb859e17ca 100644 | ||
--- a/src/win/util.c | ||
+++ b/src/win/util.c | ||
@@ -73,7 +73,9 @@ static char *process_title; | ||
static CRITICAL_SECTION process_title_lock; | ||
|
||
#pragma comment(lib, "Advapi32.lib") | ||
+#pragma comment(lib, "Dbghelp.lib") | ||
#pragma comment(lib, "IPHLPAPI.lib") | ||
+#pragma comment(lib, "Ole32.lib") | ||
#pragma comment(lib, "Psapi.lib") | ||
#pragma comment(lib, "Userenv.lib") | ||
#pragma comment(lib, "kernel32.lib") |
79 changes: 0 additions & 79 deletions
79
upstream_utils/libuv_patches/0010-Remove-uv_clock_gettime-and-add-pragmas-for-missing-.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters