summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-10 14:34:04 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-10 14:34:04 +0000
commit6d4c7182709b758782235857f22fd3632ba8df21 (patch)
tree0850f2ab24182cc903c60d185c8185d851375956 /src
parent851a23ed77b9ab3998725edb1545ae4a37cbb91f (diff)
downloadhercules-6d4c7182709b758782235857f22fd3632ba8df21.tar.gz
hercules-6d4c7182709b758782235857f22fd3632ba8df21.tar.bz2
hercules-6d4c7182709b758782235857f22fd3632ba8df21.tar.xz
hercules-6d4c7182709b758782235857f22fd3632ba8df21.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/common/socket.c4
-rw-r--r--src/common/socket.h2
2 files changed, 3 insertions, 3 deletions
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);