cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[svn] - fix a bug here

This commit is contained in:
nenolod 2007-05-08 17:32:08 -07:00
parent c1c5fdc4b6
commit f8b45e91a3
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
nenolod 2007/05/07 02:57:50 UTC (20070507-3442)
Log:
- regen configure
Changes: Modified:
+114 -1 trunk/configure (File Modified)
nenolod 2007/05/07 02:53:54 UTC (20070507-3440) nenolod 2007/05/07 02:53:54 UTC (20070507-3440)
Log: Log:
- remove "ASM hashing code" from the configure overview - remove "ASM hashing code" from the configure overview

2
include/serno.h
View File

@ -1 +1 @@
#define SERNO "20070507-3440" #define SERNO "20070507-3442"

8
libcharybdis/epoll.c
View File

@ -23,7 +23,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: epoll.c 3374 2007-04-03 10:49:11Z nenolod $ * $Id: epoll.c 3444 2007-05-09 00:32:08Z nenolod $
*/ */
#include "config.h" #include "config.h"
@ -112,7 +112,9 @@ comm_setselect(int fd, fdlist_t list, unsigned int type, PF * handler,
if(timeout) if(timeout)
F->timeout = CurrentTime + (timeout / 1000); F->timeout = CurrentTime + (timeout / 1000);
if(!(F->pflags & EPOLLIN) && !(F->pflags & EPOLLOUT)) if(old_flags == 0 && F->pflags == 0)
return;
else if(F->pflags <= 0)
op = EPOLL_CTL_DEL; op = EPOLL_CTL_DEL;
else if(old_flags == 0 && F->pflags > 0) else if(old_flags == 0 && F->pflags > 0)
op = EPOLL_CTL_ADD; op = EPOLL_CTL_ADD;
@ -131,6 +133,8 @@ comm_setselect(int fd, fdlist_t list, unsigned int type, PF * handler,
libcharybdis_log("comm_setselect(): epoll_ctl failed: %s", strerror(errno)); libcharybdis_log("comm_setselect(): epoll_ctl failed: %s", strerror(errno));
abort(); abort();
} }
} }
/* /*