From 61fd2c51d86c10499c6c1a910c821e9c28bcff48 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Wed, 28 Jan 2009 15:32:21 +0000
Subject: [PATCH] Change warning-silencing code not to cast the pointer type,
instead casting the value of the variable later.
Per comments from Tom.
---
src/test/regress/pg_regress.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 89f3fed912c..843d3c7294f 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.58 2009/01/27 12:46:16 mha Exp $
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.59 2009/01/28 15:32:21 mha Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1333,9 +1333,9 @@ wait_for_tests(PID_TYPE *pids, int *statuses, char **names, int num_tests)
while (tests_left > 0)
{
PID_TYPE p;
- int exit_status;
#ifndef WIN32
+ int exit_status;
p = wait(&exit_status);
if (p == INVALID_PID)
@@ -1345,6 +1345,7 @@ wait_for_tests(PID_TYPE *pids, int *statuses, char **names, int num_tests)
exit_nicely(2);
}
#else
+ DWORD exit_status;
int r;
r = WaitForMultipleObjects(tests_left, active_pids, FALSE, INFINITE);
@@ -1364,11 +1365,11 @@ wait_for_tests(PID_TYPE *pids, int *statuses, char **names, int num_tests)
if (p == pids[i])
{
#ifdef WIN32
- GetExitCodeProcess(pids[i], (LPDWORD) &exit_status);
+ GetExitCodeProcess(pids[i], &exit_status);
CloseHandle(pids[i]);
#endif
pids[i] = INVALID_PID;
- statuses[i] = exit_status;
+ statuses[i] = (int) exit_status;
if (names)
status(" %s", names[i]);
tests_left--;
--
GitLab