From 79f2e526efb5bda53c1b8474a18e0f35aed779a1 Mon Sep 17 00:00:00 2001 From: Babak Farrokhi Date: Sat, 18 Aug 2018 11:40:03 +0430 Subject: [PATCH 1/2] We may use alternative computers (i.e. CLANG) on hosts on which GCC is not the default compiler --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 383782d..4fe0c33 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ N2N_OSNAME=$(shell uname -p) ######## -CC=gcc +CC?=gcc DEBUG?=-g3 #OPTIMIZATION?=-O2 WARN?=-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs @@ -141,4 +141,4 @@ push: fi .PHONY: steps build push -# End Docker builder section \ No newline at end of file +# End Docker builder section From b2a1c4a9f41b0d06dc58209d37fc8e3a20ae0131 Mon Sep 17 00:00:00 2001 From: Babak Farrokhi Date: Sat, 18 Aug 2018 11:42:22 +0430 Subject: [PATCH 2/2] Fix a few leftover instances which used the old function name --- tuntap_freebsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tuntap_freebsd.c b/tuntap_freebsd.c index fc06f74..7404c95 100644 --- a/tuntap_freebsd.c +++ b/tuntap_freebsd.c @@ -20,7 +20,7 @@ #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"); if(fd < 0) { - tun_close(device); + tuntap_close(device); return(-1); } else { int a, b, c, d, e, f;