post merge fix to max_edge_num

rafzi · Apr 8, 2020 · 4d69544 · 4d69544
1 parent 44d5537
commit 4d69544
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,9 @@ DISTRIOTLIB=libdistriot.a
 CC=gcc
 LDFLAGS= -lm -pthread
 CFLAGS=-Wall -fPIC 
+ifdef MAX_EDGE_NUM
 CFLAGS+=-DMAX_EDGE_NUM=$(MAX_EDGE_NUM) 
+endif
 ifeq ($(SKIP_FUSING), 1)
 CFLAGS+=-DSKIP_FUSING
 endif

diff --git a/include/configure.h b/include/configure.h
@@ -30,6 +30,7 @@
   "192.168.0.6", \
   "192.168.0.7", \
   "192.168.0.8"}
+#ifndef MAX_EDGE_NUM
 #define MAX_EDGE_NUM 6
 #pragma message "Using default edge dev count of 6"
 #else