From: Roger Dingledine <arma@torproject.org>
Date: Mon, 1 Sep 2008 08:01:22 +0000 (+0000)
Subject: Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha.
X-Git-Tag: tor-0.2.1.6-alpha~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6942bd66eaf7a7a2bcd4a7dd4e91afc4d4e561f0;p=thirdparty%2Ftor.git

Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha.
Reported by Tas.


svn:r16713
---

diff --git a/ChangeLog b/ChangeLog
index 87c2fa8669..729a2d023a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in version 0.2.1.6-alpha - 2008-09-xx
+  o Minor bugfixes:
+    - Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha.
+      Reported by Tas.
+
+
 Changes in version 0.2.1.5-alpha - 2008-08-31
   o Major features:
     - Convert many internal address representations to optionally hold
diff --git a/src/common/compat.h b/src/common/compat.h
index 311818cb77..a0f614f55e 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -36,6 +36,9 @@
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
 #include <stdarg.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
diff --git a/src/common/container.c b/src/common/container.c
index ffb4ffe497..908bc9485e 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -14,6 +14,7 @@ const char container_c_id[] =
  * a digest-to-void* map.
  **/
 
+#include "orconfig.h"
 #include "compat.h"
 #include "util.h"
 #include "log.h"