You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2007/12/07 20:26:26 UTC
svn commit: r602186 - /httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
Author: fuankg
Date: Fri Dec 7 11:26:25 2007
New Revision: 602186
URL: http://svn.apache.org/viewvc?rev=602186&view=rev
Log:
fixed IPv6 ifdefs; added ifdef for NetWare WS2 builds.
Modified:
httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=602186&r1=602185&r2=602186&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Fri Dec 7 11:26:25 2007
@@ -31,7 +31,7 @@
#endif
/* Wish APR had one of these */
-#ifdef WIN32
+#if defined(WIN32) || defined(USE_WINSOCK)
#define FTP_APR_EADDRINUSE (APR_OS_START_SYSERR + WSAEADDRINUSE)
#else
#define FTP_APR_EADDRINUSE EADDRINUSE
@@ -1515,8 +1515,9 @@
addr = c->local_ip;
family = APR_INET;
}
+ else
#endif
- else {
+ {
addr = c->local_ip;
family = c->local_addr->family;
}
@@ -1760,9 +1761,9 @@
/* XXX: Anything special to handle IPv6 ip_addr string where c->remote_ip
* is IPv4 mapped?
*/
- if (((c->local_addr->family == APR_INET) && (family == APR_INET)) ||
+ if (((c->local_addr->family == APR_INET) && (family == APR_INET))
#if APR_HAVE_IPV6
- ((c->local_addr->family == APR_INET6) && (family == APR_INET6))
+ || ((c->local_addr->family == APR_INET6) && (family == APR_INET6))
#endif
) {
apr_sockaddr_info_get(&sa, c->local_ip, family,