You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2006/03/07 20:40:15 UTC
svn commit: r383976 - in /spamassassin/trunk/spamc: utils.c utils.h
Author: sidney
Date: Tue Mar 7 11:40:14 2006
New Revision: 383976
URL: http://svn.apache.org/viewcvs?rev=383976&view=rev
Log:
use size_t instead of socket_t for compatibility with Win32 some old FreeBSD and maybe other platforms
Modified:
spamassassin/trunk/spamc/utils.c
spamassassin/trunk/spamc/utils.h
Modified: spamassassin/trunk/spamc/utils.c
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamc/utils.c?rev=383976&r1=383975&r2=383976&view=diff
==============================================================================
--- spamassassin/trunk/spamc/utils.c (original)
+++ spamassassin/trunk/spamc/utils.c Tue Mar 7 11:40:14 2006
@@ -67,7 +67,7 @@
}
#endif
-int timeout_connect (int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen)
+int timeout_connect (int sockfd, const struct sockaddr *serv_addr, size_t addrlen)
{
int ret;
Modified: spamassassin/trunk/spamc/utils.h
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamc/utils.h?rev=383976&r1=383975&r2=383976&view=diff
==============================================================================
--- spamassassin/trunk/spamc/utils.h (original)
+++ spamassassin/trunk/spamc/utils.h Tue Mar 7 11:40:14 2006
@@ -20,6 +20,8 @@
#define UNUSED_VARIABLE(v) ((void)(v))
+#include <stddef.h>
+
extern int libspamc_timeout; /* default timeout in seconds */
#ifdef SPAMC_SSL
@@ -87,7 +89,9 @@
int fd_timeout_read(int fd, char fdflag, void *, size_t);
int ssl_timeout_read(SSL * ssl, void *, int);
-int timeout_connect (int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen);
+
+/* uses size_t instead of socket_t because socket_t not defined on some platforms */
+int timeout_connect (int sockfd, const struct sockaddr *serv_addr, size_t addrlen);
/* these are fd-only, no SSL support */
int full_read(int fd, char fdflag, void *buf, int min, int len);