libnetdissect code must include 'netdissect.h', not 'interface.h'

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 2c157844e470ee168a3bd52ea4b8306ecd7fc0c1..01de9ea293d9ead8050f8d5879f8b447f2bdb5b2 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -65,25 +65,10 @@ extern char *strdup(const char *);
 extern char *strsep(char **, const char *);
 #endif
 
-#define ESRC(ep) ((ep)->ether_shost)
-#define EDST(ep) ((ep)->ether_dhost)
-
-#ifndef NTOHL
-#define NTOHL(x)       (x) = ntohl(x)
-#define NTOHS(x)       (x) = ntohs(x)
-#define HTONL(x)       (x) = htonl(x)
-#define HTONS(x)       (x) = htons(x)
-#endif
 #endif
 
 extern char *program_name;     /* used to generate self-identifying messages */
 
-extern int32_t thiszone;       /* seconds offset from gmt to local time */
-
-extern int mask2plen(uint32_t);
-extern const char *tok2strary_internal(const char **, int, const char *, int);
-#define        tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i)
-
 extern void error(const char *, ...)
      __attribute__((noreturn))
 #ifdef __ATTRIBUTE___FORMAT_OK
@@ -99,19 +84,11 @@ extern void warning(const char *, ...)
 extern char *read_infile(char *);
 extern char *copy_argv(char **);
 
-/* The printer routines. */
-
 #include <pcap.h>
 
-#ifdef INET6
-extern int mask62plen(const u_char *);
-#endif /*INET6*/
-
 #ifndef HAVE_BPF_DUMP
 struct bpf_program;
 
 extern void bpf_dump(const struct bpf_program *, int);
 
 #endif
-
-#include "netdissect.h"