projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #876 from knocte/master
[mono.git]
/
mono
/
io-layer
/
processes.c
diff --git
a/mono/io-layer/processes.c
b/mono/io-layer/processes.c
index 4d548329ddb4ebe5b988754435b19e69e2a401ff..98012283ad3fb96011d99675e380b7229de48dd2 100644
(file)
--- a/
mono/io-layer/processes.c
+++ b/
mono/io-layer/processes.c
@@
-330,10
+330,7
@@
gboolean ShellExecuteEx (WapiShellExecuteInfo *sei)
return FALSE;
#ifdef PLATFORM_MACOSX
return FALSE;
#ifdef PLATFORM_MACOSX
- if (is_macos_10_5_or_higher ())
- handler = g_strdup ("/usr/bin/open -W");
- else
- handler = g_strdup ("/usr/bin/open");
+ handler = g_strdup ("/usr/bin/open");
#else
/*
* On Linux, try: xdg-open, the FreeDesktop standard way of doing it,
#else
/*
* On Linux, try: xdg-open, the FreeDesktop standard way of doing it,
@@
-1387,8
+1384,10
@@
gboolean EnumProcesses (guint32 *pids, guint32 len, guint32 *needed)
if (err == 0)
done = TRUE;
if (err == 0)
done = TRUE;
- else
+ else
{
free (result);
free (result);
+ result = NULL;
+ }
}
} while (err == 0 && !done);
}
} while (err == 0 && !done);
@@
-1711,9
+1710,7
@@
static GSList *load_modules (void)
const struct section *sec;
#endif
const char *name;
const struct section *sec;
#endif
const char *name;
- intptr_t slide;
- slide = _dyld_get_image_vmaddr_slide (i);
name = _dyld_get_image_name (i);
#if SIZEOF_VOID_P == 8
hdr = (const struct mach_header_64*)_dyld_get_image_header (i);
name = _dyld_get_image_name (i);
#if SIZEOF_VOID_P == 8
hdr = (const struct mach_header_64*)_dyld_get_image_header (i);