Make it build on OpenBSD again. Patch from tup.

svn:r12489

diff --git a/ChangeLog b/ChangeLog
index 4e6d398cfe252d98f1c5b615e8192ef0ff2ed3bd..92cd6b25f4d9f492a8fb72329c794aa5e013c9e3 100644 (file)
--- 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 24e43cb4e96178b68782a65bf392332c33e162db..f8ad33516e9b40d1cbc84e1a65b56939468ccdc5 100644 (file)
--- 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 31e5b4bed2cf08c1949c4767e8d366015138fc62..77dcb40bdfe30cb52dd3eb821c258392c61c43f9 100644 (file)
--- 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 aa7c632ce2a4697a36f83077aebad2f43287d0be..0230ac5b037fab232d10cf3810d1b25c448515ba 100644 (file)
--- 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"