From: Denis Ovsienko <denis@ovsienko.info>
Date: Thu, 29 Jul 2021 20:12:06 +0000 (+0100)
Subject: netdissect.h requires funcattrs.h
X-Git-Tag: tcpdump-4.99.2~89
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/5eec529b4bdac532a0182cbdc13a27666c553f71

netdissect.h requires funcattrs.h

...because the former uses PRINTFLIKE_FUNCPTR().  However, it didn't
have the #include.  However, the problem was not visible because most
files that included netdissect.h also included (directly or through
another header) funcattrs.h beforehand.  The only exceptions were the
following two files, which apparently have not been compiled anywhere
for a long time:

In file included from missing/strdup.c:38:
./netdissect.h:254:8: error: expected ':', ',', ';', '}' or
'__attribute__' before 'PRINTFLIKE_FUNCPTR'

In file included from missing/snprintf.c:45:
./netdissect.h:254:8: error: expected ':', ',', ';', '}' or
'__attribute__' before 'PRINTFLIKE_FUNCPTR'

Add the missing #include to netdissect.h to eliminate this space for
failure.

(cherry picked from commit 0a29523dfcab768d665e9336704ddf35e8bd5462)
---

diff --git a/netdissect.h b/netdissect.h
index 09f64dac..f63a5fdf 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <setjmp.h>
 #include "status-exit-codes.h"
+#include "funcattrs.h" /* for PRINTFLIKE_FUNCPTR() */
 
 /*
  * Data types corresponding to multi-byte integral values within data