From cbeb7adbde5d40b46714e675f164e4bc696a8fa3 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid.norberg@gmail.com>
Date: Sun, 5 Jun 2016 22:13:01 -0400
Subject: [PATCH] fix .travis script to run simulations (#791)

fix .travis script to run simulations
---
 .travis.yml             | 2 +-
 simulation/libsimulator | 2 +-
 src/enum_net.cpp        | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bddeb214b..40d4e9af4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -128,7 +128,7 @@ script:
 
 # simulation
   - cd simulation
-  - 'if [ "$variant" != "" && "$sim" == "1" ]; then
+  - 'if [[ "$variant" != "" && "$sim" == "1" ]]; then
       bjam -j2 crypto=built-in warnings-as-errors=on $toolset;
     fi'
   - cd ..
diff --git a/simulation/libsimulator b/simulation/libsimulator
index ea3bffe3c..f0e42435d 160000
--- a/simulation/libsimulator
+++ b/simulation/libsimulator
@@ -1 +1 @@
-Subproject commit ea3bffe3c53bca5e0976914ea951193ba43fbed6
+Subproject commit f0e42435dce3ff227cc81b17ccab143b21d8f771
diff --git a/src/enum_net.cpp b/src/enum_net.cpp
index 892524e02..1c9475ac2 100644
--- a/src/enum_net.cpp
+++ b/src/enum_net.cpp
@@ -103,6 +103,7 @@ const unsigned long siocgifmtu = SIOCGIFMTU;
 namespace libtorrent { namespace
 {
 
+#if !defined TORRENT_BUILD_SIMULATOR
 	address inaddr_to_address(in_addr const* ina, int len = 4)
 	{
 		typedef boost::asio::ip::address_v4::bytes_type bytes_t;
@@ -231,7 +232,8 @@ namespace libtorrent { namespace
 //		}
 		return true;
 	}
-#endif
+#endif // TORRENT_USE_NETLINK
+#endif // !BUILD_SIMULATOR
 
 #if TORRENT_USE_SYSCTL && !defined TORRENT_BUILD_SIMULATOR
 #ifdef TORRENT_OS2