shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use platform detection that works on mono 4.6+ (#2055)

Browse Source
This commit is contained in:
Nathan Holland
2017-11-01 23:37:51 +13:00
committed by flightlevel
parent 5c35ada012
commit 36bd2c032f
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/CurlSharp/NativeMethods.cs
View File

@@ -46,16 +46,16 @@ namespace CurlSharp
static NativeMethods()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (Environment.OSVersion.Platform == PlatformID.Win32NT)
{
switch (RuntimeInformation.OSArchitecture)
if (Environment.Is64BitOperatingSystem)
{
case Architecture.X64:
SetDllDirectory(Path.Combine(AssemblyDirectory, LIB_DIR_WIN64));
break;
case Architecture.X86:
SetDllDirectory(Path.Combine(AssemblyDirectory, LIB_DIR_WIN32));
break;
SetDllDirectory(Path.Combine(AssemblyDirectory, LIB_DIR_WIN64));
}
else
{
SetDllDirectory(Path.Combine(AssemblyDirectory, LIB_DIR_WIN32));
}
}
#if USE_LIBCURLSHIM
@@ -63,11 +63,11 @@ namespace CurlSharp
throw new InvalidOperationException("Can not run on other platform than Win NET");
#endif
}
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool SetDllDirectory(string lpPathName);
private static string AssemblyDirectory
{
get
@@ -334,7 +334,7 @@ namespace CurlSharp
{
var handle = Create();
handle.fd_count = 1;
handle.fd_array[0] = (uint) socket;
handle.fd_array[0] = (uint)socket;
return handle;
}
}
@@ -400,7 +400,7 @@ namespace CurlSharp
{
int result;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (Environment.OSVersion.Platform == PlatformID.Win32NT)
{
result = select_win(
nfds, // number of sockets, (ignored in winsock)