summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-07-12 16:17:15 +0000
committerNick Mathewson <nickm@torproject.org>2007-07-12 16:17:15 +0000
commit657bae5f53af6d4cf29c7c48b0dd5e445af524e8 (patch)
treeae2b31a51dca0604fefca758d813db035566e6cd
parent5de93f2670728421f7af56fbbec331e490a270fa (diff)
downloadtor-657bae5f53af6d4cf29c7c48b0dd5e445af524e8.tar.gz
tor-657bae5f53af6d4cf29c7c48b0dd5e445af524e8.zip
r13705@catbus: nickm | 2007-07-12 11:54:41 -0400
Backport r10643: fix solaris eventdns.c behavior: we must redefine _FILE_OFFSET_BITS *before* including sys/types. svn:r10804
-rw-r--r--ChangeLog5
-rw-r--r--src/or/eventdns.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 884db5402f..3cf5056a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@ Changes in version 0.1.2.15 - 2007-0?-??
correctly. Previously, we were under-counting by 1.
- Fix a crash bug in directory authorities when we re-number the
routerlist while inserting a new router.
+ - Backport miscellaneous cosmetic bugfixes.
+ - Fix eventdns.c behavior on Solaris: It is critical to include
+ orconfig.h _before_ sys/types.h, so that we can get the expected
+ definition of _FILE_OFFSET_BITS. [Bugfix on 0.1.2.x]
+
Changes in version 0.1.2.14 - 2007-05-25
o Directory authority changes:
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 0aba4dbfb9..bde9769811 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -32,10 +32,9 @@
* Version: 0.1b
*/
-#include <sys/types.h>
#include "eventdns_tor.h"
+#include <sys/types.h>
//#define NDEBUG
-#include "../common/torint.h"
#ifndef DNS_USE_CPU_CLOCK_FOR_ID
#ifndef DNS_USE_GETTIMEOFDAY_FOR_ID