nfq/Makefile

@@ -2,15 +2,14 @@ CC ?= gcc
 CFLAGS += -std=gnu99 -Wno-logical-op-parentheses -O3
 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-switch
 CFLAGS_MAC = -mmacosx-version-min=10.8
-LIBS_LINUX = -lnetfilter_queue -lnfnetlink -lz
+LIBS = -lnetfilter_queue -lnfnetlink -lz
 LIBS_BSD = -lz
-LIBS_CYGWIN = -lz
 SRC_FILES = *.c crypto/*.c
 
 all: nfqws
 
 nfqws: $(SRC_FILES)
-	$(CC) -s $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS_LINUX)
+	$(CC) -s $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS)
 
 bsd: $(SRC_FILES)
 	$(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o dvtws $(SRC_FILES) $(LDFLAGS) $(LIBS_BSD)
@@ -22,8 +21,5 @@ mac: $(SRC_FILES)
 	lipo -create -output dvtws dvtwsx dvtwsa
 	rm -f dvtwsx dvtwsa
 
-cygwin:
-	$(CC) -s $(CFLAGS) -o winws $(SRC_FILES) $(LDFLAGS) $(LIBS_CYGWIN)
-
 clean:
 	rm -f nfqws dvtws *.o

nfq/darkmagic.c

@@ -652,10 +652,8 @@ const char *proto_name(uint8_t proto)
 			return "6in4";
 		case IPPROTO_IPIP:
 			return "4in4";
-#ifdef IPPROTO_GRE
 		case IPPROTO_GRE:
 			return "gre";
-#endif
 #ifdef IPPROTO_SCTP
 		case IPPROTO_SCTP:
 			return "sctp";

nfq/hostlist.c

@@ -167,7 +167,6 @@ bool HostlistCheck(const char *host, bool *excluded)
 				exit(1);
 			}
 			params.hostlist_auto_mod_time = t;
-			NonEmptyHostlist(&params.hostlist);
 		}
 	}
 	return HostlistCheck_(params.hostlist, params.hostlist_exclude, host, excluded);