ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-18 20:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build fixes.

Browse Source
This commit is contained in:
Adam Ierymenko 2016-06-16 00:11:46 +00:00
parent 3c655a4b84
commit f41ea24e97
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/build.sh
View File

@ -13,6 +13,11 @@ if [ -e /usr/bin/ronn ]; then
/usr/bin/ronn -r zerotier-idtool.1.md /usr/bin/ronn -r zerotier-idtool.1.md
/usr/bin/ronn -r zerotier-one.8.md /usr/bin/ronn -r zerotier-one.8.md
else else
if [ ! -f /usr/bin/node -a ! -f /usr/bin/nodejs ]; then
echo 'Unable to build man pages: no /usr/bin/ronn or /usr/bin/node / nodejs!'
exit 0
fi
if [ ! -f node_modules/marked-man/bin/marked-man ]; then if [ ! -f node_modules/marked-man/bin/marked-man ]; then
echo 'Installing MarkDown to ROFF converter...' echo 'Installing MarkDown to ROFF converter...'
npm install marked-man npm install marked-man

4
osdep/ManagedRoute.cpp
View File

@ -41,7 +41,9 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <net/route.h> #include <net/route.h>
#include <net/if.h> #include <net/if.h>
#ifdef __BSD__
#include <net/if_dl.h> #include <net/if_dl.h>
#endif
#include <ifaddrs.h> #include <ifaddrs.h>
#endif #endif
@ -264,7 +266,7 @@ static void _routeCmd(const char *op,const InetAddress &target,const InetAddress
#endif // __WINDOWS__ -------------------------------------------------------- #endif // __WINDOWS__ --------------------------------------------------------
#ifndef ZT_ROUTING_SUPPORT_FOUND #ifndef ZT_ROUTING_SUPPORT_FOUND
#error ManagedRoute.cpp has no support for managing routes on this platform! You'll need to check and see if one of the existing ones will work and make sure proper defines are set, or write one. Please do a Github pull request if you do this for a new OS! #error "ManagedRoute.cpp has no support for managing routes on this platform! You'll need to check and see if one of the existing ones will work and make sure proper defines are set, or write one. Please do a Github pull request if you do this for a new OS."
#endif #endif
} // anonymous namespace } // anonymous namespace