From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 23 Jul 2007 22:34:28 +0000 (+0000)
Subject: Import ITS#5035 part 7 (SLAP_EPOLL_EV_PTRFD() return type).
X-Git-Tag: OPENLDAP_REL_ENG_2_3_38~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e32ef4d54197604986555022c08ec9bd386d734d;p=thirdparty%2Fopenldap.git

Import ITS#5035 part 7 (SLAP_EPOLL_EV_PTRFD() return type).
---

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 09693e05c9..35fffcc286 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -227,7 +227,8 @@ static struct slap_daemon {
 	(int *)(ptr) <= &slap_daemon.sd_index[dtblsize]) ? 0 : 1 )
 
 # define SLAP_EPOLL_EV_PTRFD(ptr)		(SLAP_EPOLL_EV_LISTENER(ptr) ? \
-	((Listener *)ptr)->sl_sd : (int *)(ptr) - slap_daemon.sd_index)
+	((Listener *)ptr)->sl_sd : \
+	(ber_socket_t) ((int *)(ptr) - slap_daemon.sd_index))
 
 # define SLAP_SOCK_DEL(s)		do { \
 	int fd, rc, index = SLAP_EPOLL_SOCK_IX((s)); \