Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed an ugly cast in socket.c

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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10205 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms
2007-04-10 14:34:04 +00:00
parent fe524e61fd
commit 9f6d32d8de
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@@ -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.

2
Makefile
View File

@@ -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

4
src/common/socket.c
View File

@@ -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);
}

2
src/common/socket.h
View File

@@ -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);