From 5e14050dc61fe11dcd400699d943722338bca5d8 Mon Sep 17 00:00:00 2001 From: monojenkins Date: Tue, 25 Feb 2020 13:46:29 -0500 Subject: [PATCH] Fix warnings: GPid vs. pid_t function signature mixup in glib test code. (#32791) Extracted from https://github.com/mono/mono/pull/19025. Co-authored-by: Jay Krell --- src/mono/mono/eglib/test/spawn.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/mono/mono/eglib/test/spawn.c b/src/mono/mono/eglib/test/spawn.c index 2b23fcf..7942a97 100644 --- a/src/mono/mono/eglib/test/spawn.c +++ b/src/mono/mono/eglib/test/spawn.c @@ -13,12 +13,6 @@ #define close _close #endif -#if _MSC_VER -// Two warnings for this significant error. -#pragma warning(disable:4022) // FIXME severe parameter mismatch with regard to g_spawn_async_with_pipes GPid -#pragma warning(disable:4047) // FIXME severe parameter mismatch with regard to g_spawn_async_with_pipes GPid -#endif - static RESULT test_spawn_sync (void) { @@ -60,7 +54,7 @@ g_spawn_async_with_pipes (const gchar *working_directory, char *argv [15]; int stdout_fd = -1; char buffer [512]; - pid_t child_pid = 0; + GPid child_pid = 0; memset (argv, 0, 15 * sizeof (char *)); argv [0] = (char*)"ls"; -- 2.7.4