VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-26 13:26:24 -04:00
Code Issues Projects Releases Wiki Activity

Fix gcc warnings

Browse Source
This commit is contained in:
Jon Beniston
2021-06-09 17:14:56 +01:00
parent 88f2170676
commit 5d24bf9086
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/util/visa.cpp
+6 -6
View File
@@ -37,17 +37,17 @@ VISA::VISA() :
#ifdef _MSC_VER
const char *visaName = "visa32.dll"; // Loads visa64.dll on WIN64
#else
const char *visaName = "visakt32.so"; // Keysight library
const char *visaName = "libktvisa32.so"; // Keysight library
#endif
visaLibrary = libraryOpen(visaName);
if (visaLibrary)
{
viOpenDefaultRM = (ViStatus (WINAPI *)(ViPSession)) libraryFunc(visaLibrary, "viOpenDefaultRM");
viOpen = (ViStatus (WINAPI *)(ViSession sesn, ViRsrc name, ViAccessMode mode, ViUInt32 timeout, ViPSession vi)) libraryFunc(visaLibrary, "viOpen");
viClose = (ViStatus (WINAPI *)(ViObject vi)) libraryFunc(visaLibrary, "viClose");
viPrintf = (ViStatus (WINAPI *) (ViSession vi, ViString writeFmt, ...)) libraryFunc(visaLibrary, "viPrintf");
viScanf = (ViStatus (WINAPI *) (ViSession vi, ViString writeFmt, ...)) libraryFunc(visaLibrary, "viScanf");
viOpenDefaultRM = (ViStatus (*)(ViPSession)) libraryFunc(visaLibrary, "viOpenDefaultRM");
viOpen = (ViStatus (*)(ViSession sesn, ViRsrc name, ViAccessMode mode, ViUInt32 timeout, ViPSession vi)) libraryFunc(visaLibrary, "viOpen");
viClose = (ViStatus (*)(ViObject vi)) libraryFunc(visaLibrary, "viClose");
viPrintf = (ViStatus (*) (ViSession vi, ViString writeFmt, ...)) libraryFunc(visaLibrary, "viPrintf");
viScanf = (ViStatus (*) (ViSession vi, ViString writeFmt, ...)) libraryFunc(visaLibrary, "viScanf");
if (viOpenDefaultRM && viOpen && viClose && viPrintf) {
m_available = true;