mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-11 11:56:16 +01:00
Merge branch '2852-musl-siginfo-t' into 'main'
gmain: Define fallback values for siginfo_t constants for musl Closes #2852 See merge request GNOME/glib!3158
This commit is contained in:
commit
9174af5421
18
glib/gmain.c
18
glib/gmain.c
@ -79,6 +79,16 @@
|
||||
#ifndef W_STOPCODE
|
||||
#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
|
||||
#endif
|
||||
#ifndef WCOREFLAG
|
||||
/* musl doesn’t define WCOREFLAG while glibc does. Unfortunately, there’s no way
|
||||
* to detect we’re building against musl, so just define it and hope.
|
||||
* See https://git.musl-libc.org/cgit/musl/tree/include/sys/wait.h#n51 */
|
||||
#define WCOREFLAG 0x80
|
||||
#endif
|
||||
#ifndef __W_CONTINUED
|
||||
/* Same as above, for musl */
|
||||
#define __W_CONTINUED 0xffff
|
||||
#endif
|
||||
#endif /* HAVE_PIDFD */
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
@ -5563,17 +5573,9 @@ siginfo_t_to_wait_status (const siginfo_t *info)
|
||||
case CLD_KILLED:
|
||||
return W_EXITCODE (0, info->si_status);
|
||||
case CLD_DUMPED:
|
||||
#ifdef WCOREFLAG
|
||||
return W_EXITCODE (0, info->si_status | WCOREFLAG);
|
||||
#else
|
||||
g_assert_not_reached ();
|
||||
#endif
|
||||
case CLD_CONTINUED:
|
||||
#ifdef __W_CONTINUED
|
||||
return __W_CONTINUED;
|
||||
#else
|
||||
g_assert_not_reached ();
|
||||
#endif
|
||||
case CLD_STOPPED:
|
||||
case CLD_TRAPPED:
|
||||
default:
|
||||
|
Loading…
Reference in New Issue
Block a user