[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Fix windows build: do not spuriously include openssl where ...
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] Fix windows build: do not spuriously include openssl where ...
- From: nickm@xxxxxxxx (Nick Mathewson)
- Date: Mon, 21 Feb 2005 21:51:58 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Mon, 21 Feb 2005 21:52:17 -0500
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Update of /home/or/cvsroot/tor/src/common
In directory moria.mit.edu:/tmp/cvs-serv12614/src/common
Modified Files:
compat.c
Log Message:
Fix windows build: do not spuriously include openssl where not needed; handle lack of gethostbyname_r properly.
Index: compat.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/compat.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- compat.c 13 Feb 2005 22:32:25 -0000 1.35
+++ compat.c 22 Feb 2005 02:51:55 -0000 1.36
@@ -72,10 +72,6 @@
#include "log.h"
#include "util.h"
-#ifdef TOR_IS_MULTITHREADED
-#include <openssl/crypto.h>
-#endif
-
/* Inline the strl functions if the platform doesn't have them. */
#ifndef HAVE_STRLCPY
#include "strlcpy.c"
@@ -537,7 +533,7 @@
#ifdef HAVE_GETHOSTBYNAME_R
ent = gethostbyname_r(name);
#else
- struct hostent *ent;
+ ent = gethostbyname(name);
#endif
if (ent) {
/* break to remind us if we move away from IPv4 */