Cleanup platform detection some more
This commit is contained in:
parent
c74ead1b31
commit
37238969fb
|
@ -85,7 +85,7 @@ namespace SparkleShare {
|
|||
ShowHelp (p);
|
||||
|
||||
|
||||
switch (SparkleShare.Platform ()) {
|
||||
switch (SparkleShare.Platform) {
|
||||
|
||||
case PlatformID.Unix:
|
||||
SetProcessName ("sparkleshare");
|
||||
|
@ -182,28 +182,34 @@ namespace SparkleShare {
|
|||
static extern int uname (IntPtr buf);
|
||||
|
||||
|
||||
static PlatformID Platform () {
|
||||
// This fixes the PlatformID enumeration for MacOSX in Environment.OSVersion.Platform,
|
||||
// which is intentionally broken in Mono for hystorical reasons
|
||||
static PlatformID Platform {
|
||||
|
||||
IntPtr buf = IntPtr.Zero;
|
||||
get {
|
||||
|
||||
try {
|
||||
IntPtr buf = IntPtr.Zero;
|
||||
|
||||
buf = Marshal.AllocHGlobal (8192);
|
||||
try {
|
||||
|
||||
if (uname (buf) == 0 && Marshal.PtrToStringAnsi (buf) == "Darwin")
|
||||
return PlatformID.MacOSX;
|
||||
buf = Marshal.AllocHGlobal (8192);
|
||||
|
||||
} catch {
|
||||
if (uname (buf) == 0 && Marshal.PtrToStringAnsi (buf) == "Darwin")
|
||||
return PlatformID.MacOSX;
|
||||
|
||||
} finally {
|
||||
} catch {
|
||||
|
||||
if (buf != IntPtr.Zero)
|
||||
Marshal.FreeHGlobal (buf);
|
||||
} finally {
|
||||
|
||||
if (buf != IntPtr.Zero)
|
||||
Marshal.FreeHGlobal (buf);
|
||||
|
||||
}
|
||||
|
||||
return Environment.OSVersion.Platform;
|
||||
|
||||
}
|
||||
|
||||
return Environment.OSVersion.Platform;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue