Merge pull request #37 from farrokhi/dev

Fix build on FreeBSD
This commit is contained in:
Luca Deri 2018-09-01 18:07:44 +02:00 committed by GitHub
commit 68cb96eb01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@ N2N_OSNAME=$(shell uname -p)
######## ########
CC=gcc CC?=gcc
DEBUG?=-g3 DEBUG?=-g3
#OPTIMIZATION?=-O2 #OPTIMIZATION?=-O2
WARN?=-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs WARN?=-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs
@ -141,4 +141,4 @@ push:
fi fi
.PHONY: steps build push .PHONY: steps build push
# End Docker builder section # End Docker builder section

View File

@ -20,7 +20,7 @@
#ifdef __FreeBSD__ #ifdef __FreeBSD__
void tun_close(tuntap_dev *device); void tuntap_close(tuntap_dev *device);
/* ********************************** */ /* ********************************** */
@ -78,7 +78,7 @@ int tuntap_open(tuntap_dev *device /* ignored */,
fd = popen(buf, "r"); fd = popen(buf, "r");
if(fd < 0) { if(fd < 0) {
tun_close(device); tuntap_close(device);
return(-1); return(-1);
} else { } else {
int a, b, c, d, e, f; int a, b, c, d, e, f;