summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-11-12 20:42:57 +0000
committerRoger Dingledine <arma@torproject.org>2007-11-12 20:42:57 +0000
commit6739ef40277b012f44e8209bb3c9e352cccc5cb1 (patch)
tree888e5fcfae2449b43ef064bcced4c1131197ddac
parentb7024f0f3076c74c44c9422c5dd7e1fe07ed276a (diff)
downloadtor-6739ef40277b012f44e8209bb3c9e352cccc5cb1.tar.gz
tor-6739ef40277b012f44e8209bb3c9e352cccc5cb1.zip
Make it build on OpenBSD again. Patch from tup.
svn:r12489
-rw-r--r--ChangeLog5
-rw-r--r--configure.in7
-rw-r--r--contrib/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
4 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e6d398cfe..92cd6b25f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes in version 0.2.0.12-alpha - 2007-11-??
+ o Compile fixes:
+ - Make it build on OpenBSD again. Patch from tup.
+
+
Changes in version 0.2.0.11-alpha - 2007-11-12
o Security fixes:
- Exit policies now reject connections that are addressed to a
diff --git a/configure.in b/configure.in
index 24e43cb4e9..f8ad33516e 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
dnl See LICENSE for licensing information
AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.0.11-alpha)
+AM_INIT_AUTOMAKE(tor, 0.2.0.11-alpha-dev)
AM_CONFIG_HEADER(orconfig.h)
AC_CANONICAL_HOST
@@ -363,7 +363,10 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, struct sockaddr_storage, s
])
AC_CHECK_TYPES([rlim_t], , ,
-[#ifdef HAVE_SYS_RESOURCE_H
+[#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
])
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 31e5b4bed2..77dcb40bdf 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -5,7 +5,7 @@
;
!include "MUI.nsh"
-!define VERSION "0.2.0.11-alpha"
+!define VERSION "0.2.0.11-alpha-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index aa7c632ce2..0230ac5b03 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -227,6 +227,6 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.0.11-alpha"
+#define VERSION "0.2.0.11-alpha-dev"