sync libratbox - r25599 + charybdis packaging patch

[irc/rqf/shadowircd.git] / libratbox / include / commio-int.h

diff --git a/libratbox/include/commio-int.h b/libratbox/include/commio-int.h
index ae84625e7f2ff44868846ea835ec2bb11806d30d..ad767dc9f4f36c92786b516b2317acea6cf366fd 100644 (file)
--- a/libratbox/include/commio-int.h
+++ b/libratbox/include/commio-int.h
@@ -115,6 +115,7 @@ struct _fde
        struct conndata *connect;
        struct acceptdata *accept;
        void *ssl;
+       unsigned int handshake_count;
        unsigned long ssl_errno;
 };
 
@@ -137,7 +138,7 @@ rb_find_fd(int fd)
        rb_dlink_list *hlist;
        rb_dlink_node *ptr;
                
-       if(unlikely(fd < 0))
+       if(rb_unlikely(fd < 0))
                return NULL;
 
        hlist = &rb_fd_table[rb_hash_fd(fd)];