]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Revert 4438ef32's changes to test_address.c
authorNick Mathewson <nickm@torproject.org>
Wed, 21 Feb 2018 14:35:48 +0000 (09:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 21 Feb 2018 14:36:37 +0000 (09:36 -0500)
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.

src/test/test_address.c

index 0dd7b403344731149912e36a646c6bd0a82bfa25..9c88d37a41b1158e678f68a4388b1dd3a87c086b 100644 (file)
 #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"