[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Check for low _MSC_VER, not high. On windows, always use w...
- To: or-cvs@freehaven.net
- Subject: [or-cvs] Check for low _MSC_VER, not high. On windows, always use w...
- From: nickm@seul.org (Nick Mathewson)
- Date: Wed, 20 Oct 2004 19:30:40 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Wed, 20 Oct 2004 19:31:18 -0400
- Reply-to: or-dev@freehaven.net
- Sender: owner-or-cvs@freehaven.net
Update of /home/or/cvsroot/src/common
In directory moria.mit.edu:/tmp/cvs-serv9358/src/common
Modified Files:
util.h
Log Message:
Check for low _MSC_VER, not high. On windows, always use winsock.
Index: util.h
===================================================================
RCS file: /home/or/cvsroot/src/common/util.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- util.h 20 Oct 2004 23:23:53 -0000 1.103
+++ util.h 20 Oct 2004 23:30:37 -0000 1.104
@@ -24,15 +24,15 @@
#error "It seems your platform does not represent NULL as zero. We can't cope."
#endif
-#ifdef HAVE_WINSOCK_H
+#ifdef MS_WINDOWS
+#if (_MSC_VER <= 1300)
#include <winsock.h>
-#endif
-#if _MSC_VER > 1300
+#else
#include <winsock2.h>
#include <ws2tcpip.h>
-#elif defined(_MSC_VER)
-#include <winsock.h>
#endif
+#endif
+
#if !defined(HAVE_GETTIMEOFDAY) && !defined(HAVE_STRUCT_TIMEVAL_TV_SEC)
struct timeval {
time_t tv_sec;