From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 11 Sep 2016 20:52:24 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/solaris_warnings_028'
X-Git-Tag: tor-0.2.9.3-alpha~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64521a9d355da9f21d81c8a82056e544372685b2;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/solaris_warnings_028'
---

64521a9d355da9f21d81c8a82056e544372685b2
diff --cc src/test/test_scheduler.c
index 2e0736f99b,db331cb662..05ea8e86e8
--- a/src/test/test_scheduler.c
+++ b/src/test/test_scheduler.c
@@@ -1,11 -1,16 +1,10 @@@
  /* Copyright (c) 2014-2016, The Tor Project, Inc. */
  /* See LICENSE for licensing information */
  
- #include <math.h>
- 
  #include "orconfig.h"
  
+ #include <math.h>
 -
 -/* Libevent stuff */
 -#ifdef HAVE_EVENT2_EVENT_H
  #include <event2/event.h>
 -#else
 -#include <event.h>
 -#endif
  
  #define TOR_CHANNEL_INTERNAL_
  #define CHANNEL_PRIVATE_