[or-cvs] r12489: Make it build on OpenBSD again. Patch from tup. (in tor/trunk: . contrib src/win32)

[arma@xxxxxxxx]

Author: arma
Date: 2007-11-12 15:42:57 -0500 (Mon, 12 Nov 2007)
New Revision: 12489

Modified:
   tor/trunk/ChangeLog
   tor/trunk/configure.in
   tor/trunk/contrib/tor-mingw.nsi.in
   tor/trunk/src/win32/orconfig.h
Log:
Make it build on OpenBSD again. Patch from tup.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-12 19:44:16 UTC (rev 12488)
+++ tor/trunk/ChangeLog	2007-11-12 20:42:57 UTC (rev 12489)
@@ -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

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-11-12 19:44:16 UTC (rev 12488)
+++ tor/trunk/configure.in	2007-11-12 20:42:57 UTC (rev 12489)
@@ -4,7 +4,7 @@
 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([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
 ])

Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in	2007-11-12 19:44:16 UTC (rev 12488)
+++ tor/trunk/contrib/tor-mingw.nsi.in	2007-11-12 20:42:57 UTC (rev 12489)
@@ -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/";
 

Modified: tor/trunk/src/win32/orconfig.h
===================================================================
--- tor/trunk/src/win32/orconfig.h	2007-11-12 19:44:16 UTC (rev 12488)
+++ tor/trunk/src/win32/orconfig.h	2007-11-12 20:42:57 UTC (rev 12489)
@@ -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"