Browse code

Fix compilation error on platforms without SO_ERROR

git-svn: trunk@2726

Nigel Horne authored on 2007/02/13 08:35:14
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Mon Feb 12 23:34:38 GMT 2007 (njh)
2
+---------------------------------
3
+  * libclamav/mbox.c:	Fix compilation error on platforms without SO_ERROR
4
+
1 5
 Tue Feb 13 00:02:26 CET 2007 (tk)
2 6
 ---------------------------------
3 7
   * clamconf/clamconf.c: add -n switch
... ...
@@ -16,7 +16,7 @@
16 16
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17 17
  *  MA 02110-1301, USA.
18 18
  */
19
-static	char	const	rcsid[] = "$Id: mbox.c,v 1.375 2007/02/12 22:22:27 njh Exp $";
19
+static	char	const	rcsid[] = "$Id: mbox.c,v 1.376 2007/02/12 23:34:24 njh Exp $";
20 20
 
21 21
 #ifdef	_MSC_VER
22 22
 #include <winsock.h>	/* only needed in CL_EXPERIMENTAL */
... ...
@@ -4752,6 +4752,7 @@ nonblock_connect(int sock, const struct sockaddr *addr, socklen_t addrlen, int s
4752 4752
 static int
4753 4753
 connect_error(int sock)
4754 4754
 {
4755
+#ifdef	SO_ERROR
4755 4756
 	int optval;
4756 4757
 	socklen_t optlen;
4757 4758
 
... ...
@@ -4763,6 +4764,9 @@ connect_error(int sock)
4763 4763
 			sock, optval, strerror(optval));
4764 4764
 
4765 4765
 	return optval ? -1 : 0;
4766
+#else
4767
+	return 0;
4768
+#endif
4766 4769
 }
4767 4770
 
4768 4771
 #else