mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-4'
-- Resolved conflicts: NEWS common/exechelp-w32.c configure.ac
This commit is contained in:
commit
4485930f9f
103 changed files with 1485 additions and 1135 deletions
|
@ -437,6 +437,7 @@ check_syscall_func (void)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
pre_syscall (void)
|
||||
{
|
||||
|
@ -444,6 +445,7 @@ pre_syscall (void)
|
|||
pre_syscall_func ();
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
post_syscall (void)
|
||||
{
|
||||
|
@ -579,7 +581,7 @@ spawn_detached (const char *pgmname, char *cmdline,
|
|||
cr_flags, /* Creation flags. */
|
||||
NULL, /* Environment. */
|
||||
NULL, /* Use current drive/directory. */
|
||||
(STARTUPINFOW *)&si, /* Startup information. */
|
||||
(STARTUPINFOW *)&si, /* Startup information. */
|
||||
&pi /* Returns process information. */
|
||||
);
|
||||
if (!ret)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue