Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

wpilibc: Remove direct CameraServer dependency (#1989)

Browse Source 
This makes linking easier, particularly for third party vendors and other language wrappers.
This commit is contained in:
Thad House
2019-10-27 08:37:30 -07:00
committed by Peter Johnson
parent 8e333c0aad
commit 936627bd94
10 changed files with 142 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpiutil/src/main/native/windows/StackWalker.cpp
View File

@@ -88,6 +88,7 @@
#include <stdlib.h>
#include <tchar.h>
#pragma comment(lib, "version.lib") // for "VerQueryValue"
#pragma comment(lib, "Advapi32.lib") // for "GetUserName"
#pragma warning(disable : 4826)
#ifdef UNICODE
@@ -484,8 +485,8 @@ private:
if (hToolhelp == NULL)
continue;
createToolhelp32Snapshot = (tCT32S)GetProcAddress(hToolhelp, "CreateToolhelp32Snapshot");
module32First = (tM32F)GetProcAddress(hToolhelp, strModule32First);
module32Next = (tM32N)GetProcAddress(hToolhelp, strModule32Next);
module32First = (tM32F)GetProcAddress(hToolhelp, strModule32First);
module32Next = (tM32N)GetProcAddress(hToolhelp, strModule32Next);
if ((createToolhelp32Snapshot != NULL) && (module32First != NULL) && (module32Next != NULL))
break; // found the functions!
FreeLibrary(hToolhelp);