Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 7abf9c41da9edd7095723e42a085be9ea6aa1779..58e5ab33e51f4a0b1878929fa4cfcaf9ccb6bba5 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -28,24 +28,12 @@
 
 #include "funcattrs.h"
 
-/* snprintf et al */
-
 #include <stdarg.h>
 
 #if HAVE_STDINT_H
 #include <stdint.h>
 #endif
 
-#if !defined(HAVE_SNPRINTF)
-int snprintf(char *, size_t, FORMAT_STRING(const char *), ...)
-     PRINTFLIKE(3, 4);
-#endif /* !defined(HAVE_SNPRINTF) */
-
-#if !defined(HAVE_VSNPRINTF)
-int vsnprintf(char *, size_t, FORMAT_STRING(const char *), va_list)
-     PRINTFLIKE(3, 0);
-#endif /* !defined(HAVE_VSNPRINTF) */
-
 #ifndef HAVE_STRLCAT
 extern size_t strlcat(char *, const char *, size_t);
 #endif
@@ -69,7 +57,13 @@ extern char *program_name;   /* used to generate self-identifying messages */
 
 #ifndef HAVE_BPF_DUMP
 struct bpf_program;
+#endif
 
+/*
+ * With Capsicum bpf_dump() may be not declared even if HAVE_BPF_DUMP is set.
+ */
+#if !defined(HAVE_BPF_DUMP) || \
+    (defined(HAVE_BPF_DUMP) && HAVE_CAPSICUM && !defined(bpf_dump))
 extern void bpf_dump(const struct bpf_program *, int);
 
 #endif