From: Michael Tremer Date: Sun, 1 Feb 2015 23:21:51 +0000 (+0100) Subject: Fix merge error X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f7c4af762acd4a158ce4dfafead46817e55ec3f;p=people%2Fms%2Fdnsmasq.git Fix merge error --- diff --git a/src/dnsmasq.h b/src/dnsmasq.h index 7bb2055..1fb23b8 100644 --- a/src/dnsmasq.h +++ b/src/dnsmasq.h @@ -1503,6 +1503,7 @@ int detect_loop(char *query, int type); void inotify_dnsmasq_init(); int inotify_check(time_t now); void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revhashsz); +#endif /* isc.c */ #ifdef HAVE_ISC_READER