diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-21 09:35:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-21 09:36:37 -0500 |
| commit | fc22bcadb51bcabb9b9c16a9768adbe86788b7f1 (patch) | |
| tree | 934253396196750c2aa7465965f8c4b1e81b2e8e /src/test/test_address.c | |
| parent | 4438ef3288256e1f1ba706c157206a2ac190781d (diff) | |
| download | tor-fc22bcadb51bcabb9b9c16a9768adbe86788b7f1.tar.gz tor-fc22bcadb51bcabb9b9c16a9768adbe86788b7f1.zip | |
Revert 4438ef32's changes to test_address.c
Apparently some versions of the mac sdk care about the ordering of
net/if.h wrt other headers.
Fixes bug 25319; bug not in any released tor.
Diffstat (limited to 'src/test/test_address.c')
| -rw-r--r-- | src/test/test_address.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/test/test_address.c b/src/test/test_address.c index 0dd7b40334..9c88d37a41 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -11,11 +11,8 @@ #include <iphlpapi.h> #endif -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif - #ifdef HAVE_IFADDRS_TO_SMARTLIST +#include <net/if.h> #include <ifaddrs.h> #endif @@ -23,6 +20,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif +#include <net/if.h> #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */ #include "or.h" |