Removed an ugly cast in socket.c

Fixed Makefile (-Wno-unused-parameter was added twice with gcc4)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10205 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 7 insertions, 4 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ed35d01b3..d725e5e84 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/04/11
+	* Removed an ugly cast in socket.c
+	* Fixed Makefile (-Wno-unused-parameter was added twice with gcc4) [Toms]
 2007/04/10
 	* Recoded and renamed the trim function in strlib to normalize_name.
 	* Added a proper trim function to strlib.
diff --git a/Makefile b/Makefile
index 70cb51326..8b36c84c8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ OPT += -ffast-math
 # OPT += -fomit-frame-pointer
 OPT += -Wall -Wno-sign-compare -Wno-unused-parameter
 ifeq ($(GCC_VERSION), 4)
-	OPT += -Wno-unused-parameter -Wno-pointer-sign
+	OPT += -Wno-pointer-sign
 endif
 # Server Packet Protocol version (also defined in src/common/mmo.h)
 # OPT += -DPACKETVER=8
diff --git a/src/common/socket.c b/src/common/socket.c
index 34c707827..6a742fce5 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -103,7 +103,7 @@ void set_defaultparse(ParseFunc defaultparse)
 /*======================================
  *	CORE : Socket options
  *--------------------------------------*/
-void set_nonblocking(int fd, int yes)
+void set_nonblocking(int fd, unsigned long yes)
 {
 	// TCP_NODELAY BOOL Disables the Nagle algorithm for send coalescing.
 	if(MODE_NODELAY)
@@ -111,7 +111,7 @@ void set_nonblocking(int fd, int yes)
 	
 	// FIONBIO Use with a nonzero argp parameter to enable the nonblocking mode of socket s. 
 	// The argp parameter is zero if nonblocking is to be disabled. 
-	if (ioctlsocket(fd, FIONBIO, (unsigned long*)&yes) != 0)
+	if (ioctlsocket(fd, FIONBIO, &yes) != 0)
 		ShowError("Couldn't set the socket to non-blocking mode (code %d)!\n", s_errno);
 }
 
diff --git a/src/common/socket.h b/src/common/socket.h
index eae9baf72..41acbeabd 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -121,7 +121,7 @@ void socket_final(void);
 
 extern void flush_fifo(int fd);
 extern void flush_fifos(void);
-extern void set_nonblocking(int fd, int yes);
+extern void set_nonblocking(int fd, unsigned long yes);
 
 void set_defaultparse(ParseFunc defaultparse);