[or-cvs] r10804: Backport r10643: fix solaris eventdns.c behavior: we must re (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-07-12 12:17:15 -0400 (Thu, 12 Jul 2007)
New Revision: 10804

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/eventdns.c
Log:
 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.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13705] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-07-12 16:17:12 UTC (rev 10803)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-07-12 16:17:15 UTC (rev 10804)
@@ -7,7 +7,12 @@
       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:
     - Two directory authorities (moria1 and moria2) just moved to new

Modified: tor/branches/tor-0_1_2-patches/src/or/eventdns.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/eventdns.c	2007-07-12 16:17:12 UTC (rev 10803)
+++ tor/branches/tor-0_1_2-patches/src/or/eventdns.c	2007-07-12 16:17:15 UTC (rev 10804)
@@ -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