From: Anatol Belski <ab@php.net>
Date: Tue, 11 Nov 2014 19:16:13 +0000 (+0100)
Subject: fix datatype mismatch and unused var warning
X-Git-Tag: PRE_NATIVE_TLS_MERGE~130^2~20^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e6c7c6165127b8966752433726cbafa92afc5d3;p=php

fix datatype mismatch and unused var warning
---

diff --git a/main/network.c b/main/network.c
index 9fd1285493..f44cad29a5 100644
--- a/main/network.c
+++ b/main/network.c
@@ -1126,17 +1126,19 @@ PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short p
 PHPAPI int php_set_sock_blocking(php_socket_t socketd, int block TSRMLS_DC)
 {
 	int ret = SUCCESS;
-	int flags;
-	int myflag = 0;
 
 #ifdef PHP_WIN32
+	u_long flags;
+
 	/* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */
 	flags = !block;
 	if (ioctlsocket(socketd, FIONBIO, &flags) == SOCKET_ERROR) {
 		ret = FAILURE;
 	}
 #else
-	flags = fcntl(socketd, F_GETFL);
+	int myflag = 0;
+	int flags = fcntl(socketd, F_GETFL);
+
 #ifdef O_NONBLOCK
 	myflag = O_NONBLOCK; /* POSIX version */
 #elif defined(O_NDELAY)