From: Steve Hay <steve.m.hay@googlemail.com>
Date: Tue, 18 Sep 2012 19:47:09 +0000 (+0100)
Subject: Squash two win32.c warnings which have crept in recently
X-Git-Tag: upstream/5.20.0~5389
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adb86be5ee633b2258ce1113f26fcdeb89cb1889;p=platform%2Fupstream%2Fperl.git

Squash two win32.c warnings which have crept in recently

Ensure a non-void function always returns something, and a signed/unsigned
mismatch.
---

diff --git a/win32/win32.c b/win32/win32.c
index 0a13ecd..a16410f 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -170,11 +170,11 @@ static BOOL silent_invalid_parameter_handler = FALSE;
 static BOOL
 set_silent_invalid_parameter_handler(BOOL newvalue)
 {
-#  ifdef _DEBUG
     BOOL oldvalue = silent_invalid_parameter_handler;
+#  ifdef _DEBUG
     silent_invalid_parameter_handler = newvalue;
-    return oldvalue;
 #  endif
+    return oldvalue;
 }
 
 static void
@@ -1342,7 +1342,7 @@ get_hwnd_delay(pTHX, long child, DWORD tries)
     if (hwnd != INVALID_HANDLE_VALUE) return hwnd;
 
     {
-	int count = 0;
+	unsigned int count = 0;
 	/* No Sleep(1) if tries==0, just fail instead if we get this far. */
 	while (count++ < tries) {
 	    Sleep(1);