[tor-commits] [trunnel/master] Include trunnel-local.h before any standard C headers

[nickm at torproject.org]

commit 26713665d320b5e758dee8c52ffeaf330283c414
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 28 10:49:25 2016 -0400

    Include trunnel-local.h before any standard C headers
    
    This way, trunnel-local can do things like setting _FILE_OFFSET_BITS
    other things that need to happen before the standards headers.
---
 lib/trunnel/__init__.py         | 2 +-
 lib/trunnel/data/trunnel-impl.h | 6 +++---
 lib/trunnel/data/trunnel.c      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py
index 2633dfd..ec7b001 100644
--- a/lib/trunnel/__init__.py
+++ b/lib/trunnel/__init__.py
@@ -3,4 +3,4 @@
 # a package.
 #
 
-__version__ = "1.4.5"
+__version__ = "1.4.6"
diff --git a/lib/trunnel/data/trunnel-impl.h b/lib/trunnel/data/trunnel-impl.h
index e6de363..98dce21 100644
--- a/lib/trunnel/data/trunnel-impl.h
+++ b/lib/trunnel/data/trunnel-impl.h
@@ -7,12 +7,12 @@
 
 #ifndef TRUNNEL_IMPL_H_INCLUDED_
 #define TRUNNEL_IMPL_H_INCLUDED_
-#include "trunnel.h"
-#include <assert.h>
-#include <string.h>
 #ifdef TRUNNEL_LOCAL_H
 #include "trunnel-local.h"
 #endif
+#include "trunnel.h"
+#include <assert.h>
+#include <string.h>
 
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 #define uint8_t unsigned char
diff --git a/lib/trunnel/data/trunnel.c b/lib/trunnel/data/trunnel.c
index 285a310..b533743 100644
--- a/lib/trunnel/data/trunnel.c
+++ b/lib/trunnel/data/trunnel.c
@@ -6,9 +6,9 @@
  * See trunnel-impl.h for documentation of these functions.
  */
 
+#include "trunnel-impl.h"
 #include <stdlib.h>
 #include <string.h>
-#include "trunnel-impl.h"
 
 #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
 	__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__