Use the EXTRACT_U_1() macro in some utility functions

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index 7b12c5507f854dabbb86b7135c88cd114abec222..fa7f07f4b7b705c9c3f169fe3e8490608ae837d5 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -27,10 +27,10 @@
 /* \summary: Token Ring printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
@@ -92,7 +92,7 @@ struct token_header {
 static const char tstr[] = "[|token-ring]";
 
 /* Extract src, dst addresses */
-static inline void
+static void
 extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst)
 {
        memcpy(fdst, (const char *)trp->token_dhost, 6);
@@ -102,7 +102,7 @@ extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst)
 /*
  * Print the TR MAC header
  */
-static inline void
+static void
 token_hdr_print(netdissect_options *ndo,
                 const struct token_header *trp, u_int length,
                 const u_char *fsrc, const u_char *fdst)