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

Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Adam Ierymenko 2019-06-11 11:01:20 -07:00
commit cf046a4039
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/ZeroTierOne.h
View File

@ -1096,7 +1096,8 @@ enum ZT_Architecture
ZT_ARCHITECTURE_SPARC64 = 12,
ZT_ARCHITECTURE_DOTNET_CLR = 13,
ZT_ARCHITECTURE_JAVA_JVM = 14,
ZT_ARCHITECTURE_WEB = 15
ZT_ARCHITECTURE_WEB = 15,
ZT_ARCHITECTURE_S390X = 16
};
/**

3
make-linux.mk
View File

@ -224,6 +224,9 @@ ifeq ($(CC_MACH),mips64el)
ZT_ARCHITECTURE=6
override DEFS+=-DZT_NO_TYPE_PUNNING
endif
ifeq ($(CC_MACH),s390x)
ZT_ARCHITECTURE=16
endif
# Fail if system architecture could not be determined
ifeq ($(ZT_ARCHITECTURE),999)